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

Unified Diff: chrome/browser/about_flags.cc

Issue 2358573002: Protect some definitions in about_flags.cc with #defined(USE_ASH) (Closed)
Patch Set: Protect kAshMaterialDesignChoices in about_flags.cc with #defined(USE_ASH) Created 4 years, 2 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 | « no previous file | no next file » | 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 6deea230cde4c1626bfa2d7edfa7a86318562e32..53a7f033da6e65b9219963c5660fbee56bf9e10e 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -370,7 +370,7 @@ const FeatureEntry::Choice kTopChromeMaterialDesignChoices[] = {
switches::kTopChromeMDMaterialHybrid },
};
-#if defined(OS_CHROMEOS)
+#if defined(USE_ASH)
const FeatureEntry::Choice kAshMaterialDesignChoices[] = {
{IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
{IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, ash::switches::kAshMaterialDesign,
@@ -380,7 +380,9 @@ const FeatureEntry::Choice kAshMaterialDesignChoices[] = {
{IDS_FLAGS_ASH_MD_EXPERIMENTAL, ash::switches::kAshMaterialDesign,
ash::switches::kAshMaterialDesignExperimental},
};
+#endif // USE_ASH
+#if defined(OS_CHROMEOS)
const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
{IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
{IDS_FLAGS_MATERIAL_DESIGN_INK_DROP_ANIMATION_FAST,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698