CrOS: Move force UI mode switch from switches to ash 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 <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 488 matching lines @@
     {flags_ui::kGenericExperimentChoiceDisabled,
      switches::kNtpSwitchToExistingTab, "disabled"},
     {flag_descriptions::kNtpSwitchToExistingTabMatchUrl,
      switches::kNtpSwitchToExistingTab, "url"},
     {flag_descriptions::kNtpSwitchToExistingTabMatchHost,
      switches::kNtpSwitchToExistingTab, "host"},
 };
 #endif  // OS_ANDROID
 
 #if defined(OS_CHROMEOS)
-const FeatureEntry::Choice kForceTabletModeChoices[] = {
+const FeatureEntry::Choice kAshForceTabletModeChoices[] = {
     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-    {flag_descriptions::kForceTabletModeTouchview, switches::kForceTabletMode,
-     switches::kForceTabletModeTouchView},
-    {flag_descriptions::kForceTabletModeClamshell, switches::kForceTabletMode,
-     switches::kForceTabletModeClamshell},
-    {flag_descriptions::kForceTabletModeAuto, switches::kForceTabletMode,
-     switches::kForceTabletModeAuto},
+    {flag_descriptions::kForceTabletModeTouchview,
+     ash::switches::kAshForceTabletMode,
+     ash::switches::kAshForceTabletModeTouchView},
+    {flag_descriptions::kForceTabletModeClamshell,
+     ash::switches::kAshForceTabletMode,
+     ash::switches::kAshForceTabletModeClamshell},
+    {flag_descriptions::kForceTabletModeAuto,
+     ash::switches::kAshForceTabletMode,
+     ash::switches::kAshForceTabletModeAuto},
 };
 #endif  // OS_CHROMEOS
 
 #if defined(OS_ANDROID)
 const FeatureEntry::FeatureParam
     kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = {
         {ntp_snippets::kCategoryOrderParameter,
          ntp_snippets::kCategoryOrderGeneral},
 };
 
@@ skipping 1947 matching lines @@
      SINGLE_VALUE_TYPE(chromeos::switches::kEnableChromeVoxArcSupport)},
 #endif  // defined(OS_CHROMEOS)
 
     {"enable-mojo-loading", flag_descriptions::kMojoLoadingName,
      flag_descriptions::kMojoLoadingDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kLoadingWithMojo)},
 
 #if defined(OS_CHROMEOS)
     {"force-tablet-mode", flag_descriptions::kForceTabletModeName,
      flag_descriptions::kForceTabletModeDescription, kOsCrOS,
-     MULTI_VALUE_TYPE(kForceTabletModeChoices)},
+     MULTI_VALUE_TYPE(kAshForceTabletModeChoices)},
 #endif  // OS_CHROMEOS
 
 #if defined(OS_ANDROID)
     {"use-new-doodle-api", flag_descriptions::kUseNewDoodleApiName,
      flag_descriptions::kUseNewDoodleApiDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kUseNewDoodleApi)},
 #endif  // OS_ANDROID
 
     {"delay-navigation", flag_descriptions::kDelayNavigationName,
      flag_descriptions::kDelayNavigationDescription, kOsAll,
@@ skipping 202 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags