Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1492)

Unified Diff: chrome/browser/about_flags.cc

Issue 2617733002: Hide docked windows behind a flag (Closed)
Patch Set: Fix tests failed because of DCHECK Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 9f2116302216232fccbbbe18be6f58c37b51f348..1276ff1eb1e029ff480c3a05e6a32f5fff92ba98 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -869,8 +869,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_NAME,
IDS_FLAGS_GPU_RASTERIZATION_MSAA_SAMPLE_COUNT_DESCRIPTION, kOsAll,
MULTI_VALUE_TYPE(kGpuRasterizationMSAASampleCountChoices)},
- {"slimming-paint-invalidation",
- IDS_FLAGS_SLIMMING_PAINT_INVALIDATION_NAME,
+ {"slimming-paint-invalidation", IDS_FLAGS_SLIMMING_PAINT_INVALIDATION_NAME,
IDS_FLAGS_SLIMMING_PAINT_INVALIDATION_DESCRIPTION, kOsAll,
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSlimmingPaintInvalidation,
switches::kDisableSlimmingPaintInvalidation)},
@@ -1023,6 +1022,11 @@ const FeatureEntry kFeatureEntries[] = {
ash::switches::kAshDisableMaximizeModeWindowBackdrop),
},
{
+ "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME,
+ IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll,
varkha 2017/01/18 20:58:32 Should this be a Chrome OS only flag?
+ SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows),
+ },
+ {
"ash-enable-touch-view-testing",
IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME,
IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, kOsCrOS,
@@ -2016,8 +2020,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_NAME,
IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV2)},
- {"android-payment-apps",
- IDS_FLAGS_ANDROID_PAYMENT_APPS_NAME,
+ {"android-payment-apps", IDS_FLAGS_ANDROID_PAYMENT_APPS_NAME,
IDS_FLAGS_ANDROID_PAYMENT_APPS_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kAndroidPaymentApps)},
#endif // OS_ANDROID
@@ -2054,8 +2057,7 @@ const FeatureEntry kFeatureEntries[] = {
{"no-credit-card-abort", IDS_FLAGS_NO_CREDIT_CARD_ABORT,
IDS_FLAGS_NO_CREDIT_CARD_ABORT_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kNoCreditCardAbort)},
- {"autofill-scan-theme-dialog",
- IDS_FLAGS_AUTOFILL_SCAN_THEME_DIALOG_NAME,
+ {"autofill-scan-theme-dialog", IDS_FLAGS_AUTOFILL_SCAN_THEME_DIALOG_NAME,
IDS_FLAGS_AUTOFILL_SCAN_THEME_DIALOG_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kAutofillScanThemeDialog)},
#endif // OS_ANDROID

Powered by Google App Engine
This is Rietveld 408576698