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 501 matching lines @@
     {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, switches::kNtpSwitchToExistingTab,
      "disabled"},
     {IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_MATCH_URL,
      switches::kNtpSwitchToExistingTab, "url"},
     {IDS_FLAGS_NTP_SWITCH_TO_EXISTING_TAB_MATCH_HOST,
      switches::kNtpSwitchToExistingTab, "host"},
 };
 #endif  // OS_ANDROID
 
 #if defined(OS_CHROMEOS)
-const FeatureEntry::Choice kForceTabletModeChoices[] = {
+const FeatureEntry::Choice kAshForceTabletModeChoices[] = {
     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
-    {IDS_FLAGS_FORCE_TABLET_MODE_TOUCHVIEW, switches::kForceTabletMode,
-     switches::kForceTabletModeTouchView},
-    {IDS_FLAGS_FORCE_TABLET_MODE_CLAMSHELL, switches::kForceTabletMode,
-     switches::kForceTabletModeClamshell},
-    {IDS_FLAGS_FORCE_TABLET_MODE_AUTO, switches::kForceTabletMode,
-     switches::kForceTabletModeAuto},
+    {IDS_FLAGS_FORCE_TABLET_MODE_TOUCHVIEW, ash::switches::kAshForceTabletMode,
+     ash::switches::kAshForceTabletModeTouchView},
+    {IDS_FLAGS_FORCE_TABLET_MODE_CLAMSHELL, ash::switches::kAshForceTabletMode,
+     ash::switches::kAshForceTabletModeClamshell},
+    {IDS_FLAGS_FORCE_TABLET_MODE_AUTO, ash::switches::kAshForceTabletMode,
+     ash::switches::kAshForceTabletModeAuto},
 };
 #endif  // OS_CHROMEOS
 
 #if defined(OS_ANDROID)
 const FeatureEntry::FeatureParam
     kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = {
         {ntp_snippets::kCategoryOrderParameter,
          ntp_snippets::kCategoryOrderGeneral},
 };
 
@@ skipping 1849 matching lines @@
      IDS_FLAGS_ENABLE_CHROMEVOX_ARC_SUPPORT_NAME,
      IDS_FLAGS_ENABLE_CHROMEVOX_ARC_SUPPORT_DESCRIPTION, kOsCrOS,
      SINGLE_VALUE_TYPE(chromeos::switches::kEnableChromeVoxArcSupport)},
 #endif  // defined(OS_CHROMEOS)
 
     {"enable-mojo-loading", IDS_FLAGS_MOJO_LOADING_NAME,
      IDS_FLAGS_MOJO_LOADING_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(features::kLoadingWithMojo)},
 
 #if defined(OS_CHROMEOS)
-    {"force-tablet-mode", IDS_FLAGS_FORCE_TABLET_MODE_NAME,
+    {"ash-force-tablet-mode", IDS_FLAGS_FORCE_TABLET_MODE_NAME,

[Daniel Erat, 2017/03/28 19:30:12]

just to make sure i understand this: changing this will drop the old value (if
anyone has set it) and possibly leave an orphaned pref, right? maybe that's not
a big deal, but components/flags_ui/feature_entry.h mentions that you shouldn't
change it.

[sammiequon, 2017/03/28 20:32:00]

I see. Would this work? It wouldn't have "ash-" but then we wouldn't have to
have two flags showing up with one doing nothing.

[Daniel Erat, 2017/03/28 20:35:33]

yes, i think that what you have now is fine (at least from my reading of this
struct's comments, it sounded like this identifier is just used internally, so i
think it's okay to keep the old value without the "ash-" prefix).

      IDS_FLAGS_FORCE_TABLET_MODE_DESCRIPTION, kOsCrOS,
-     MULTI_VALUE_TYPE(kForceTabletModeChoices)},
+     MULTI_VALUE_TYPE(kAshForceTabletModeChoices)},
 #endif  // OS_CHROMEOS
 
 #if defined(OS_ANDROID)
     {"use-new-doodle-api", IDS_FLAGS_USE_NEW_DOODLE_API_NAME,
      IDS_FLAGS_USE_NEW_DOODLE_API_DESCRIPTION, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kUseNewDoodleApi)},
 #endif  // OS_ANDROID
 
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in
@@ skipping 196 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags