diff options
| author | azurewei <azurewei@chromium.org> | 2016-03-23 00:28:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-23 07:30:39 +0000 |
| commit | 25de2101dc3acb881a8efef783a5dbe903fc57f3 (patch) | |
| tree | 84b3298d11859d36a80e0e7d422b33f358719165 /chromeos | |
| parent | 098bc41e8e3731d3947e18f8fbbd08a47b147da2 (diff) | |
| download | chromium_src-25de2101dc3acb881a8efef783a5dbe903fc57f3.zip chromium_src-25de2101dc3acb881a8efef783a5dbe903fc57f3.tar.gz chromium_src-25de2101dc3acb881a8efef783a5dbe903fc57f3.tar.bz2 | |
Turn on the IME menu flag by default.
BUG=570761
TEST=None
Review URL: https://codereview.chromium.org/1827683003
Cr-Commit-Position: refs/heads/master@{#382803}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 5 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 15b3167..d3abe54 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -346,8 +346,9 @@ const char kCrosRegionsModeHide[] = "hide"; // Forces CrOS region value. const char kCrosRegion[] = "cros-region"; -// Enables IME menu +// 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, @@ -403,7 +404,7 @@ GetMemoryPressureThresholds() { } bool IsImeMenuEnabled() { - return base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableImeMenu); + return !base::CommandLine::ForCurrentProcess()->HasSwitch(kDisableImeMenu); } bool IsGaiaIdMigrationStarted() { diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 47b7637..d1d9d54 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -43,6 +43,7 @@ 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[]; |