Aura/ash split: Split the extra parts into ash and aura parts.

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>
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gl/gl_switches.h"
 
+#if defined(USE_ASH)
+#include "ash/ash_switches.h"
+#endif
+
 #if defined(USE_AURA)
-#include "ash/ash_switches.h"
 #include "ui/aura/aura_switches.h"
 #endif
 
 using content::UserMetricsAction;
 
 namespace about_flags {
 
 // Macros to simplify specifying the type.
 #define SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, switch_value) \
     Experiment::SINGLE_VALUE, command_line_switch, switch_value, NULL, 0
@@ skipping 399 matching lines @@
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnableMediaSource)
   },
   {
     "enable-pointer-lock",
     IDS_FLAGS_ENABLE_POINTER_LOCK_NAME,
     IDS_FLAGS_ENABLE_POINTER_LOCK_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnablePointerLock)
   },
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   {
     "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
+#if defined(USE_AURA)
   {
     "aura-disable-hold-mouse-moves",
     IDS_FLAGS_AURA_DISABLE_HOLD_MOUSE_MOVES_NAME,
     IDS_FLAGS_AURA_DISABLE_HOLD_MOUSE_MOVES_DESCRIPTION,
     kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kAuraDisableHoldMouseMoves)
   },
 #endif  // defined(USE_AURA)
   {
     "enable-gamepad",
@@ skipping 101 matching lines @@
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kWebUITaskManager)
   },
   {
     "disable-ntp-other-sessions-menu",
     IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME,
     IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu)
   },
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   {
     "enable-ash-uber-tray",
     IDS_FLAGS_ENABLE_ASH_UBER_TRAY_NAME,
     IDS_FLAGS_ENABLE_ASH_UBER_TRAY_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(ash::switches::kAshUberTray),
   },
   {
     "enable-ash-oak",
     IDS_FLAGS_ENABLE_ASH_OAK_NAME,
@@ skipping 444 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags