| Index: chrome/browser/chromeos/input_method/mock_input_method_manager.h
|
| diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
|
| index ef8001f3dba90f91f05a09c01be286d8f85e7c79..794db451ecd166e9a14a44a53601afe0fa7826aa 100644
|
| --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h
|
| +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
|
| @@ -36,9 +36,10 @@ class MockInputMethodManager : 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_layout) 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;
|
| @@ -51,7 +52,7 @@ class MockInputMethodManager : 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;
|
| @@ -74,7 +75,6 @@ class MockInputMethodManager : public InputMethodManager {
|
|
|
| // Set values that will be provided to the InputMethodUtil.
|
| void set_application_locale(const std::string& value);
|
| - void set_hardware_keyboard_layout(const std::string& value);
|
|
|
| // TODO(yusukes): Add more variables for counting the numbers of the API calls
|
| int add_observer_count_;
|
|
|