| 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,
|
| - ENABLE_DISABLE_VALUE_TYPE(switches::kTopChromeMDEnabled,
|
| - switches::kTopChromeMDDisabled)},
|
| + MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)},
|
| #endif
|
| {"touch-events",
|
| IDS_TOUCH_EVENTS_NAME,
|
|
|