diff options
| author | azurewei <azurewei@chromium.org> | 2016-01-09 23:01:14 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-10 07:02:16 +0000 |
| commit | 103ed21273e49ddff067a378d0eed30a816bd1b4 (patch) | |
| tree | 8cc1696d0fc9a7f2d41887bfa13a9bb5bd67e497 /chromeos | |
| parent | 8477524140c1fbe839eefe6f79ef71fd097da32f (diff) | |
| download | chromium_src-103ed21273e49ddff067a378d0eed30a816bd1b4.zip chromium_src-103ed21273e49ddff067a378d0eed30a816bd1b4.tar.gz chromium_src-103ed21273e49ddff067a378d0eed30a816bd1b4.tar.bz2 | |
Add an option in language settings for activating the IME menu on the shelf.
A flag "enable-ime-menu" is added to turn on this feature. When building Chrome OS with the command line flag: --enable-ime-menu, the div section 'language-options-ime-menu-template' in language settings page will show. Otherwise, this section will be hidden.
Once the checkbox 'activate-ime-menu' is checked by users, the preference value pref::kLanguageImeMenuActivated will be set to be true.
BUG=570761
TEST=Verified bug not repro on local build.
Review URL: https://codereview.chromium.org/1523593002
Cr-Commit-Position: refs/heads/master@{#368529}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 7 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 2e4682e..33611ac 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -327,6 +327,9 @@ const char kCrosRegionsModeHide[] = "hide"; // Forces CrOS region value. const char kCrosRegion[] = "cros-region"; +// Enables IME menu +const char kEnableImeMenu[] = "enable-ime-menu"; + bool WakeOnWifiEnabled() { return !base::CommandLine::ForCurrentProcess()->HasSwitch(kDisableWakeOnWifi); } @@ -373,5 +376,9 @@ GetMemoryPressureThresholds() { return MemoryPressureMonitor::THRESHOLD_DEFAULT; } +bool IsImeMenuEnabled() { + return base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableImeMenu); +} + } // namespace switches } // namespace chromeos diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 957b5a6..9723ae3 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -59,6 +59,7 @@ CHROMEOS_EXPORT extern const char kEnableArc[]; CHROMEOS_EXPORT extern const char kEnableConsumerManagement[]; CHROMEOS_EXPORT extern const char kEnableExtensionAssetsSharing[]; 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[]; @@ -118,6 +119,8 @@ CHROMEOS_EXPORT bool MemoryPressureHandlingEnabled(); CHROMEOS_EXPORT base::chromeos::MemoryPressureMonitor::MemoryPressureThresholds GetMemoryPressureThresholds(); +CHROMEOS_EXPORT bool IsImeMenuEnabled(); + } // namespace switches } // namespace chromeos |