diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-17 10:56:17 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-17 10:56:17 +0000 |
| commit | 39699140299fd70d13c53a446976318f683f57b3 (patch) | |
| tree | 34c99dfe4364dde521ab12cfe8d0886bcf576f72 /chrome/browser/chromeos/input_method/input_method_manager_impl.h | |
| parent | d741fa57ad0a097b74204c88b6beb70803b6353e (diff) | |
| download | chromium_src-39699140299fd70d13c53a446976318f683f57b3.zip chromium_src-39699140299fd70d13c53a446976318f683f57b3.tar.gz chromium_src-39699140299fd70d13c53a446976318f683f57b3.tar.bz2 | |
Support comma separated hardware keyboard layout value.
To be able to use comma-separated keyboard_layout, extends
GetHardwareKeyboardLayout and EnableLoginLayouts.
This change does not break backward compatibility.
BUG=334576
TEST=manually done.
Review URL: https://codereview.chromium.org/139803010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251653 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 | 9 |
1 files changed, 5 insertions, 4 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 f24152e..889a3f2 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -59,9 +59,10 @@ class InputMethodManagerImpl : public InputMethodManager, virtual size_t GetNumActiveInputMethods() const OVERRIDE; virtual const InputMethodDescriptor* GetInputMethodFromId( const std::string& input_method_id) const OVERRIDE; - virtual void EnableLoginLayouts(const std::string& language_code, - const std::string& initial_layout) OVERRIDE; - virtual bool EnableInputMethods( + virtual void EnableLoginLayouts( + const std::string& language_code, + const std::vector<std::string>& initial_layouts) OVERRIDE; + virtual bool ReplaceEnabledInputMethods( const std::vector<std::string>& new_active_input_method_ids) OVERRIDE; virtual bool EnableInputMethod(const std::string& new_active_input_method_id) OVERRIDE; @@ -74,7 +75,7 @@ class InputMethodManagerImpl : public InputMethodManager, virtual void GetInputMethodExtensions( InputMethodDescriptors* result) OVERRIDE; virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE; - virtual void SetInputMethodDefault() OVERRIDE; + virtual void SetInputMethodLoginDefault() OVERRIDE; virtual bool SwitchToNextInputMethod() OVERRIDE; virtual bool SwitchToPreviousInputMethod( const ui::Accelerator& accelerator) OVERRIDE; |