diff options
| author | azurewei <azurewei@chromium.org> | 2016-03-23 18:30:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 01:31:54 +0000 |
| commit | 19663e2c38d7c62202c9f4fc5b42eea3af903141 (patch) | |
| tree | 5af8aba16a9fe04113fb438003cd981a74745588 /chromeos | |
| parent | 0c2fd47d62aba824e36bc78560f8c9d4288a30dd (diff) | |
| download | chromium_src-19663e2c38d7c62202c9f4fc5b42eea3af903141.zip chromium_src-19663e2c38d7c62202c9f4fc5b42eea3af903141.tar.gz chromium_src-19663e2c38d7c62202c9f4fc5b42eea3af903141.tar.bz2 | |
This cl does the following work:
- adds the flag of enabling opt-in IME menu in the about page.
- updates the string "IDS_OPTIONS_SETTINGS_LANGUAGES_ACTIVATE_IME_MENU" in the language page as what UI reviewer suggests.
BUG=570761
TEST=None
Review URL: https://codereview.chromium.org/1818863002
Cr-Commit-Position: refs/heads/master@{#383006}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 8 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 987984b..3382113 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -353,10 +353,6 @@ const char kCrosRegionsModeHide[] = "hide"; // Forces CrOS region value. const char kCrosRegion[] = "cros-region"; -// Enables or disables the opt-in IME menu. -const char kEnableImeMenu[] = "enable-ime-menu"; -const char kDisableImeMenu[] = "disable-ime-menu"; - // Controls CrOS GaiaId migration for tests: // "" - default, // "started" - migration started (i.e. all stored user keys will be converted @@ -410,10 +406,6 @@ GetMemoryPressureThresholds() { return MemoryPressureMonitor::THRESHOLD_DEFAULT; } -bool IsImeMenuEnabled() { - return !base::CommandLine::ForCurrentProcess()->HasSwitch(kDisableImeMenu); -} - bool IsGaiaIdMigrationStarted() { base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); if (!command_line->HasSwitch(kTestCrosGaiaIdMigration)) diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index fa61ba5..58a4bff 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -44,7 +44,6 @@ CHROMEOS_EXPORT extern const char kDisableDemoMode[]; CHROMEOS_EXPORT extern const char kDisableDeviceDisabling[]; CHROMEOS_EXPORT extern const char kDisableGaiaServices[]; CHROMEOS_EXPORT extern const char kDisableHIDDetectionOnOOBE[]; -CHROMEOS_EXPORT extern const char kDisableImeMenu[]; CHROMEOS_EXPORT extern const char kDisableLoginAnimations[]; CHROMEOS_EXPORT extern const char kDisableMemoryPressureSystemChromeOS[]; CHROMEOS_EXPORT extern const char kDisableMtpWriteSupport[]; @@ -66,7 +65,6 @@ CHROMEOS_EXPORT extern const char kEnableExperimentalAccessibilityFeatures[]; CHROMEOS_EXPORT extern const char kEnableExtensionAssetsSharing[]; CHROMEOS_EXPORT extern const char kEnableFilesDetailsPanel[]; CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[]; -CHROMEOS_EXPORT extern const char kEnableImeMenu[]; CHROMEOS_EXPORT extern const char kEnableKioskMode[]; CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[]; CHROMEOS_EXPORT extern const char kDisableNewKoreanIme[]; @@ -128,8 +126,6 @@ CHROMEOS_EXPORT bool MemoryPressureHandlingEnabled(); CHROMEOS_EXPORT base::chromeos::MemoryPressureMonitor::MemoryPressureThresholds GetMemoryPressureThresholds(); -CHROMEOS_EXPORT bool IsImeMenuEnabled(); - CHROMEOS_EXPORT bool IsGaiaIdMigrationStarted(); } // namespace switches } // namespace chromeos |