| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index c50a88c5f001420855939593bb6201363c2e7e43..cc6190de6698f25dab91d16f059a7fd6bc86c8c6 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -388,6 +388,24 @@ const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = {
|
| switches::kTopChromeMDMaterialHybrid },
|
| };
|
|
|
| +#if defined(USE_ASH)
|
| +const FeatureEntry::Choice kAshShelfColorChoices[] = {
|
| + {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
|
| + {IDS_FLAGS_ASH_SHELF_COLOR_LIGHT_VIBRANT, ash::switches::kAshShelfColor,
|
| + ash::switches::kAshShelfColorLightVibrant},
|
| + {IDS_FLAGS_ASH_SHELF_COLOR_NORMAL_VIBRANT, ash::switches::kAshShelfColor,
|
| + ash::switches::kAshShelfColorNormalVibrant},
|
| + {IDS_FLAGS_ASH_SHELF_COLOR_DARK_VIBRANT, ash::switches::kAshShelfColor,
|
| + ash::switches::kAshShelfColorDarkVibrant},
|
| + {IDS_FLAGS_ASH_SHELF_COLOR_LIGHT_MUTED, ash::switches::kAshShelfColor,
|
| + ash::switches::kAshShelfColorLightMuted},
|
| + {IDS_FLAGS_ASH_SHELF_COLOR_NORMAL_MUTED, ash::switches::kAshShelfColor,
|
| + ash::switches::kAshShelfColorNormalMuted},
|
| + {IDS_FLAGS_ASH_SHELF_COLOR_DARK_MUTED, ash::switches::kAshShelfColor,
|
| + ash::switches::kAshShelfColorDarkMuted},
|
| +};
|
| +#endif // USE_ASH
|
| +
|
| #if defined(OS_CHROMEOS)
|
| const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
|
| {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
|
| @@ -1049,6 +1067,9 @@ const FeatureEntry kFeatureEntries[] = {
|
| IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS,
|
| SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen),
|
| },
|
| + {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR,
|
| + IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS,
|
| + MULTI_VALUE_TYPE(kAshShelfColorChoices)},
|
| #endif // USE_ASH
|
| #if defined(OS_CHROMEOS)
|
| {"material-design-ink-drop-animation-speed",
|
|
|