summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 22:21:59 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 22:21:59 +0000
commitc54ad56778fe411234f14594d7d81a57a954dbc3 (patch)
treedb15c99d362ca76361b1ab1aca3cc05def918c99
parentb752e7a73f1019fab2b3813981a72a75450e036f (diff)
downloadchromium_src-c54ad56778fe411234f14594d7d81a57a954dbc3.zip
chromium_src-c54ad56778fe411234f14594d7d81a57a954dbc3.tar.gz
chromium_src-c54ad56778fe411234f14594d7d81a57a954dbc3.tar.bz2
Aura: Hide about:flag for Aura window mode if device only supports one mode
BUG=none TEST=Run chrome with --force-compact-window-mode, about:flags does not show "Window mode" flag Review URL: https://chromiumcodereview.appspot.com/9226029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118748 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/about_flags.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index ec4a57f..22a332d 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -745,6 +745,16 @@ ListValue* GetFlagsExperimentsData(PrefService* prefs) {
l10n_util::GetStringUTF16(
experiment.visible_description_id));
bool supported = !!(experiment.supported_platforms & current_platform);
+#if defined(USE_AURA) && defined(OS_CHROMEOS)
+ // Some Chrome OS devices currently require Aura compact window mode, so
+ // don't offer a choice of mode.
+ // TODO(jamescook): Remove after Aura supports normal mode on all devices,
+ // likely around M19.
+ if (experiment.visible_name_id == IDS_FLAGS_AURA_WINDOW_MODE_NAME &&
+ CommandLine::ForCurrentProcess()->
+ HasSwitch(ash::switches::kAuraForceCompactWindowMode))
+ supported = false;
+#endif
data->SetBoolean("supported", supported);
ListValue* supported_platforms = new ListValue();