Chromium Code Reviews| Index: chrome/browser/about_flags.cc |
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
| index 6639dd8c758968e87445f1b2083b825f27aa212d..f80537fd6c267ee8eb25333e3254a321a4c950eb 100644 |
| --- a/chrome/browser/about_flags.cc |
| +++ b/chrome/browser/about_flags.cc |
| @@ -426,6 +426,20 @@ const Experiment::Choice kAshScreenRotationAnimationChoices[] = { |
| }; |
| #endif |
| +#if defined(ENABLE_TOPCHROME_MD) |
| +const Experiment::Choice kTopChromeMaterialDesignChoices[] = { |
| + {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
|
flackr
2015/06/18 20:50:58
Unless/until we make this an experiment where defa
bruthig
2015/06/22 18:51:11
Done.
|
| + {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| + switches::kTopChromeMD, |
| + switches::kTopChromeMDEnabled}, |
| + {IDS_FLAGS_TOP_CHROME_MD_HYBRID_ENABLED, |
| + switches::kTopChromeMD, |
| + switches::kTopChromeMDHybridEnabled}, |
| + {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| + switches::kTopChromeMD, |
| + switches::kTopChromeMDDisabled}}; |
| +#endif |
| + |
| #if defined(OS_CHROMEOS) |
| const Experiment::Choice kDataSaverPromptChoices[] = { |
| { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| @@ -797,8 +811,7 @@ const Experiment kExperiments[] = { |
| IDS_FLAGS_TOP_CHROME_MD, |
| IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, |
| kOsWin | kOsCrOS, |
| - ENABLE_DISABLE_VALUE_TYPE(switches::kTopChromeMDEnabled, |
| - switches::kTopChromeMDDisabled)}, |
| + MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)}, |
| #endif |
| {"touch-events", |
| IDS_TOUCH_EVENTS_NAME, |