CrOS: Move force UI mode switch from switches to ash switches.

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 a429648555f2fe9e804f7a9c9aed318be35ce02b..2075db7a8b5261fe01ff91a26c3ac51263ab2ceb 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -519,14 +519,14 @@ const FeatureEntry::Choice kNtpSwitchToExistingTabChoices[] = {
 #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
 
@@ -2396,9 +2396,9 @@ const FeatureEntry kFeatureEntries[] = {
      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)