diff options
author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 20:10:11 +0000 |
---|---|---|
committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 20:10:11 +0000 |
commit | 56e352554edf141b3de2ba0eedee93687400f912 (patch) | |
tree | 6f41bbf27f829e4e8f8b30a6daf5eac458d1b012 /chrome/browser/chromeos/input_method/input_method_manager_impl.h | |
parent | bc90a10d8345933978cabe9ac6d8e2f170b1a85d (diff) | |
download | chromium_src-56e352554edf141b3de2ba0eedee93687400f912.zip chromium_src-56e352554edf141b3de2ba0eedee93687400f912.tar.gz chromium_src-56e352554edf141b3de2ba0eedee93687400f912.tar.bz2 |
Do not consume Ctrl+Space if there is only one input method is activated.
BUG=240196
TEST=Manually checked the Ctrl+Space does not consumed by Google Docs spread
sheet if only us layout is enabled.
Review URL: https://chromiumcodereview.appspot.com/19790010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/input_method_manager_impl.h')
-rw-r--r-- | chrome/browser/chromeos/input_method/input_method_manager_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h index 16de674..1d0d417 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -91,7 +91,8 @@ class InputMethodManagerImpl : public InputMethodManager, InputMethodDescriptors* result) OVERRIDE; virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE; virtual bool SwitchToNextInputMethod() OVERRIDE; - virtual bool SwitchToPreviousInputMethod() OVERRIDE; + virtual bool SwitchToPreviousInputMethod( + const ui::Accelerator& accelerator) OVERRIDE; virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE; virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE; virtual InputMethodPropertyList |