aura: Replace UI-feature GYP flags with switches.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 462 matching lines @@
     kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(ash::switches::kAuraTranslucentFrames)
   },
   {
     "aura-google-dialog-frames",
     IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME,
     IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION,
     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.
   {
     "aura-window-mode",
     IDS_FLAGS_AURA_WINDOW_MODE_NAME,
     IDS_FLAGS_AURA_WINDOW_MODE_DESCRIPTION,
     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,
     IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION,
 #if defined(USE_SKIA)
     kOsMac | kOsLinux | kOsCrOS,
 #else
     0,
 #endif
     SINGLE_VALUE_TYPE(switches::kEnablePerTilePainting)
@@ skipping 456 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags