Index: 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 f24152e18a58dbd5a756562fbb6e91981a93eb69..889a3f2e8c2a72260652a3896ef5cced77d102ed 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; |