Enable the flag of scrollable shelf by default
This CL enables scrollable shelf as default. It will be landed after
discussion with other team members.
Bug: 1002576
Change-Id: I4dab5b81bf6418d5cc066f2763b4b5862ebff716
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790755
Commit-Queue: Andrew Xu <andrewxu@chromium.org>
Reviewed-by: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698284}
This commit is contained in:
ash/shelf
chrome/browser
chromeos/constants
tools/metrics/histograms
@ -39,8 +39,6 @@ class ScrollableShelfViewTest : public AshTestBase {
|
||||
~ScrollableShelfViewTest() override = default;
|
||||
|
||||
void SetUp() override {
|
||||
base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
||||
chromeos::switches::kShelfScrollable);
|
||||
AshTestBase::SetUp();
|
||||
scrollable_shelf_view_ = GetPrimaryShelf()
|
||||
->shelf_widget()
|
||||
|
@ -1711,7 +1711,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
SINGLE_VALUE_TYPE(chromeos::switches::kShelfHoverPreviews)},
|
||||
{"shelf-scrollable", flag_descriptions::kShelfScrollableName,
|
||||
flag_descriptions::kShelfScrollableDescription, kOsCrOS,
|
||||
SINGLE_VALUE_TYPE(chromeos::switches::kShelfScrollable)},
|
||||
FEATURE_VALUE_TYPE(chromeos::features::kShelfScrollable)},
|
||||
{"show-bluetooth-debug-log-toggle",
|
||||
flag_descriptions::kShowBluetoothDebugLogToggleName,
|
||||
flag_descriptions::kShowBluetoothDebugLogToggleDescription, kOsCrOS,
|
||||
|
@ -157,6 +157,10 @@ const base::Feature kParentalControlsSettings{
|
||||
const base::Feature kReleaseNotes{"ReleaseNotes",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
|
||||
// Enables or disables the scrollable shelf.
|
||||
const base::Feature kShelfScrollable{"ShelfScrollable",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
|
||||
// Enables or disables a toggle to enable Bluetooth debug logs.
|
||||
const base::Feature kShowBluetoothDebugLogToggle{
|
||||
"ShowBluetoothDebugLogToggle", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
@ -76,6 +76,8 @@ extern const base::Feature kParentalControlsSettings;
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
||||
extern const base::Feature kReleaseNotes;
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
||||
extern const base::Feature kShelfScrollable;
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
||||
extern const base::Feature kShowBluetoothDebugLogToggle;
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
||||
extern const base::Feature kShowBluetoothDeviceBattery;
|
||||
|
@ -8,6 +8,7 @@
|
||||
|
||||
#include "base/command_line.h"
|
||||
#include "base/metrics/field_trial.h"
|
||||
#include "chromeos/constants/chromeos_features.h"
|
||||
#include "third_party/icu/source/common/unicode/locid.h"
|
||||
|
||||
namespace chromeos {
|
||||
@ -457,9 +458,6 @@ const char kShelfHotseat[] = "shelf-hotseat";
|
||||
// App window previews when hovering over the shelf.
|
||||
const char kShelfHoverPreviews[] = "shelf-hover-previews";
|
||||
|
||||
// Scrollable list of apps on the shelf.
|
||||
const char kShelfScrollable[] = "shelf-scrollable";
|
||||
|
||||
// If true, files in Android internal storage will be shown in Files app.
|
||||
const char kShowAndroidFilesInFilesApp[] = "show-android-files-in-files-app";
|
||||
|
||||
@ -560,7 +558,8 @@ bool ShouldShowScrollableShelf() {
|
||||
// If we're showing the new shelf design, also enable scrollable shelf.
|
||||
if (ShouldShowShelfHotseat())
|
||||
return true;
|
||||
return base::CommandLine::ForCurrentProcess()->HasSwitch(kShelfScrollable);
|
||||
|
||||
return base::FeatureList::IsEnabled(features::kShelfScrollable);
|
||||
}
|
||||
|
||||
bool ShouldTetherHostScansIgnoreWiredConnections() {
|
||||
|
@ -184,7 +184,6 @@ COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kRlzPingDelay[];
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kSamlPasswordChangeUrl[];
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kShelfHoverPreviews[];
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kShelfHotseat[];
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kShelfScrollable[];
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
||||
extern const char kShowAndroidFilesInFilesApp[];
|
||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const char kShowLoginDevOverlay[];
|
||||
|
@ -34935,6 +34935,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
|
||||
label="enable-zero-suggest-most-visited-without-serp"/>
|
||||
<int value="-1886713568"
|
||||
label="AutofillGetPaymentsIdentityFromSync:disabled"/>
|
||||
<int value="-1885074774" label="ShelfScrollable:enabled"/>
|
||||
<int value="-1883170077" label="EnableHtmlBaseUsernameDetector:disabled"/>
|
||||
<int value="-1882330924" label="NTPArticleSuggestions:enabled"/>
|
||||
<int value="-1881250251" label="InterestFeedContentSuggestions:disabled"/>
|
||||
@ -35080,7 +35081,6 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
|
||||
<int value="-1684773837" label="TabEngagementReportingAndroid:disabled"/>
|
||||
<int value="-1684123448" label="disable-best-effort-tasks"/>
|
||||
<int value="-1682843294" label="DataReductionProxyDecidesTransform:enabled"/>
|
||||
<int value="-1681832882" label="shelf-scrollable"/>
|
||||
<int value="-1679624666" label="NtpRealbox:enabled"/>
|
||||
<int value="-1677715989" label="UnifiedConsent:disabled"/>
|
||||
<int value="-1676256979"
|
||||
@ -36529,6 +36529,7 @@ from previous Chrome versions.
|
||||
<int value="223591010" label="CastMediaRouteProvider:enabled"/>
|
||||
<int value="223662457" label="BackgroundLoadingForDownloads:enabled"/>
|
||||
<int value="229476202" label="CryptAuthV2Enrollment:enabled"/>
|
||||
<int value="229877058" label="ShelfScrollable:disabled"/>
|
||||
<int value="233721248" label="DownloadRename:disabled"/>
|
||||
<int value="237570976" label="CommandLineOnNonRooted:disabled"/>
|
||||
<int value="237964589"
|
||||
|
Reference in New Issue
Block a user