Rename TouchView to TabletMode
No changes to strings that may be used as flag values, metrics, as
they're already used.
BUG: 726476
Change-Id: I91588f2bca5ceb100abdf10b5c2be2f2b2b0c979
Reviewed-on: https://chromium-review.googlesource.com/577380
Commit-Queue: Mitsuru Oshima <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Jacob Dufault <[email protected]>
Cr-Commit-Position: refs/heads/master@{#496518}diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 0b6d0a9d..99d53a0 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -651,17 +651,14 @@
#endif // OS_ANDROID
#if defined(OS_CHROMEOS)
-const FeatureEntry::Choice kAshForceTabletModeChoices[] = {
+const FeatureEntry::Choice kAshUiModeChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
- {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},
+ {flag_descriptions::kUiModeTablet, ash::switches::kAshUiMode,
+ ash::switches::kAshUiModeTablet},
+ {flag_descriptions::kUiModeClamshell, ash::switches::kAshUiMode,
+ ash::switches::kAshUiModeClamshell},
+ {flag_descriptions::kUiModeAuto, ash::switches::kAshUiMode,
+ ash::switches::kAshUiModeAuto},
};
#endif // OS_CHROMEOS
@@ -3009,9 +3006,9 @@
FEATURE_VALUE_TYPE(features::kFetchKeepaliveTimeoutSetting)},
#if defined(OS_CHROMEOS)
- {"force-tablet-mode", flag_descriptions::kForceTabletModeName,
- flag_descriptions::kForceTabletModeDescription, kOsCrOS,
- MULTI_VALUE_TYPE(kAshForceTabletModeChoices)},
+ {"force-tablet-mode", flag_descriptions::kUiModeName,
+ flag_descriptions::kUiModeDescription, kOsCrOS,
+ MULTI_VALUE_TYPE(kAshUiModeChoices)},
#endif // OS_CHROMEOS
{"memory-ablation", flag_descriptions::kMemoryAblationName,
