From 39699140299fd70d13c53a446976318f683f57b3 Mon Sep 17 00:00:00 2001 From: "nona@chromium.org" Date: Mon, 17 Feb 2014 10:56:17 +0000 Subject: 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 --- chrome/browser/chromeos/input_method/input_method_manager_impl.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'chrome/browser/chromeos/input_method/input_method_manager_impl.h') 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& initial_layouts) OVERRIDE; + virtual bool ReplaceEnabledInputMethods( const std::vector& 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* ids) OVERRIDE; - virtual void SetInputMethodDefault() OVERRIDE; + virtual void SetInputMethodLoginDefault() OVERRIDE; virtual bool SwitchToNextInputMethod() OVERRIDE; virtual bool SwitchToPreviousInputMethod( const ui::Accelerator& accelerator) OVERRIDE; -- cgit v1.1