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

Unified Diff: chrome/browser/about_flags.cc

Issue 1188713007: Moved --top-chrome-md command line switch from chrome_switches to ui_base_switches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed typedef in unittest. Created 5 years, 6 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 6091a6f1a24fede1806c08cd93c7b333fce3458f..f9e2e4b5871bc6c3fa294eb8cb5f7975e6c87322 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -426,6 +426,17 @@ const Experiment::Choice kAshScreenRotationAnimationChoices[] = {
};
#endif
+#if defined(ENABLE_TOPCHROME_MD)
+const Experiment::Choice kTopChromeMaterialDesignChoices[] = {
+ {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""},
+ {IDS_FLAGS_TOP_CHROME_MD_MATERIAL,
+ switches::kTopChromeMD,
+ switches::kTopChromeMDMaterial},
+ {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID,
+ switches::kTopChromeMD,
+ switches::kTopChromeMDMaterialHybrid}};
+#endif
+
#if defined(OS_CHROMEOS)
const Experiment::Choice kDataSaverPromptChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
@@ -797,8 +808,7 @@ const Experiment kExperiments[] = {
IDS_FLAGS_TOP_CHROME_MD,
IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION,
kOsWin | kOsCrOS,
tdanderson 2015/06/26 21:38:23 I just noticed you're missing Linux here. Mind add
bruthig 2015/06/29 14:18:57 https://codereview.chromium.org/1219683003
- ENABLE_DISABLE_VALUE_TYPE(switches::kTopChromeMDEnabled,
- switches::kTopChromeMDDisabled)},
+ MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)},
#endif
{"touch-events",
IDS_TOUCH_EVENTS_NAME,
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698