Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index f488aedc3ccf5320dd2f638ac3f510690074b021..6601b1b4a95a1cfd292c8e40c101fbd1aee175f3 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -363,6 +363,17 @@ const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = { |
#endif |
#if defined(OS_CHROMEOS) |
+ |
+const FeatureEntry::Choice kAshMaterialDesignChoices[] = { |
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
+ {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, ash::switches::kAshMaterialDesign, |
+ ash::switches::kAshMaterialDesignDisabled}, |
+ {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, ash::switches::kAshMaterialDesign, |
+ ash::switches::kAshMaterialDesignEnabled}, |
+ {IDS_FLAGS_ASH_MD_EXPERIMENTAL, ash::switches::kAshMaterialDesign, |
+ ash::switches::kAshMaterialDesignExperimental}, |
+}; |
+ |
const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { |
{IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""}, |
{IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST, |
@@ -867,6 +878,9 @@ const FeatureEntry kFeatureEntries[] = { |
SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), |
}, |
{ |
+ "ash-md", IDS_FLAGS_ASH_MD, IDS_FLAGS_ASH_MD_DESCRIPTION, kOsCrOS, |
+ MULTI_VALUE_TYPE(kAshMaterialDesignChoices)}, |
+ { |
"ash-stable-overview-order", IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_NAME, |
IDS_FLAGS_ASH_STABLE_OVERVIEW_ORDER_DESCRIPTION, kOsCrOS, |
ENABLE_DISABLE_VALUE_TYPE( |