Move Chrome OS switches to chromeos/chromeos_switches.cc

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index f9291db06941ffef78eb2688ce8b87ea0b1b2e1e..cab1cf59a962e15d7900924a60020fd998b404e1 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -171,11 +171,11 @@ const Experiment::Choice kAshBootAnimationFunction[] = {
 };
 
 const Experiment::Choice kChromeCaptivePortalDetectionChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR,
-    switches::kEnableChromeCaptivePortalDetector, ""},
+    chromeos::switches::kEnableChromeCaptivePortalDetector, "" },
   { IDS_FLAGS_SHILL_CAPTIVE_PORTAL_DETECTOR,
-    switches::kDisableChromeCaptivePortalDetector, ""}
+    chromeos::switches::kDisableChromeCaptivePortalDetector, "" }
 };
 
 #endif
@@ -595,7 +595,7 @@ const Experiment kExperiments[] = {
     kOsCrOS,
 #if defined(OS_CHROMEOS)
     // This switch exists only on Chrome OS.
-    SINGLE_VALUE_TYPE(switches::kEnableStaticIPConfig)
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableStaticIPConfig)
 #else
     SINGLE_VALUE_TYPE("")
 #endif
@@ -893,7 +893,7 @@ const Experiment kExperiments[] = {
     IDS_ENABLE_BACKLOADER_NAME,
     IDS_ENABLE_BACKLOADER_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kEnableBackgroundLoader)
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader)
   },
   {
     "enable-bezel-touch",
@@ -914,7 +914,7 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_NO_DISCARD_TABS_NAME,
     IDS_FLAGS_NO_DISCARD_TABS_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kNoDiscardTabs)
+    SINGLE_VALUE_TYPE(chromeos::switches::kNoDiscardTabs)
   },
 #endif
   {
@@ -951,14 +951,14 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
     IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerClick)
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)
   },
   {
     "allow-touchpad-three-finger-swipe",
     IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_NAME,
     IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_SWIPE_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerSwipe)
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerSwipe)
   },
 #endif
   {
@@ -1033,7 +1033,7 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_DISABLE_BOOT_ANIMATION,
     IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION,
     kOsCrOSOwnerOnly,
-    SINGLE_VALUE_TYPE(switches::kDisableBootAnimation),
+    SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation),
   },
   {
     "disable-boot-animation2",
@@ -1068,14 +1068,14 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_FILE_MANAGER_LEGACY_NAME,
     IDS_FLAGS_FILE_MANAGER_LEGACY_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kFileManagerLegacy),
+    SINGLE_VALUE_TYPE(chromeos::switches::kFileManagerLegacy),
   },
   {
     "file-manager-legacy-ui",
     IDS_FLAGS_FILE_MANAGER_LEGACY_UI_NAME,
     IDS_FLAGS_FILE_MANAGER_LEGACY_UI_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kFileManagerLegacyUI),
+    SINGLE_VALUE_TYPE(chromeos::switches::kFileManagerLegacyUI),
   },
   {
     "disable-launcher-per-display",
@@ -1089,7 +1089,7 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_DISABLE_KIOSK_APPS_NAME,
     IDS_FLAGS_DISABLE_KIOSK_APPS_DESCRIPTION,
     kOsCrOSOwnerOnly,
-    SINGLE_VALUE_TYPE(switches::kDisableAppMode),
+    SINGLE_VALUE_TYPE(chromeos::switches::kDisableAppMode),
   },
   {
     "disable-force-fullscreen-app",
@@ -1210,14 +1210,14 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_ENABLE_CARRIER_SWITCHING,
     IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching)
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableCarrierSwitching)
   },
   {
     "enable-request-tablet-site",
     IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME,
     IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kEnableRequestTabletSite)
+    SINGLE_VALUE_TYPE(chromeos::switches::kEnableRequestTabletSite)
   },
 #endif
   {