aura: Replace UI-feature GYP flags with switches.
This replaces the aura_show_about_flag_window_mode and
chromeos_legacy_power_button GYP flags with
--aura-force-compact-window-mode and
--aura-legacy-power-button command-line switches. There is
concern that using compile-time flags to control these
features will greatly increase the workload on the Chrome OS
builders; we apparently currently share Chrome binaries
across all Chrome OS boards with the same architecture.
BUG=109209,109052,chrome-os-partner:7570
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/9264025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118522 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index d5efe19..6a5d068 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -480,15 +480,6 @@
kOsWin | kOsLinux | kOsCrOS,
SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames)
},
-#endif // defined(USE_AURA)
- {
- "enable-gamepad",
- IDS_FLAGS_ENABLE_GAMEPAD_NAME,
- IDS_FLAGS_ENABLE_GAMEPAD_DESCRIPTION,
- kOsAll,
- SINGLE_VALUE_TYPE(switches::kEnableGamepad)
- },
-#if defined(AURA_SHOW_ABOUT_FLAG_WINDOW_MODE)
// TODO(jamescook): Enable this for all ChromeOS builds when we're sure
// Aura laptop mode performance and feature set match traditional non-Aura
// builds.
@@ -499,7 +490,14 @@
kOsWin | kOsLinux | kOsCrOS,
MULTI_VALUE_TYPE(kAuraWindowModeChoices)
},
-#endif
+#endif // defined(USE_AURA)
+ {
+ "enable-gamepad",
+ IDS_FLAGS_ENABLE_GAMEPAD_NAME,
+ IDS_FLAGS_ENABLE_GAMEPAD_DESCRIPTION,
+ kOsAll,
+ SINGLE_VALUE_TYPE(switches::kEnableGamepad)
+ },
{
"per-tile-painting",
IDS_FLAGS_PER_TILE_PAINTING_NAME,
