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 76c50c44f0eca6f5a1034733921835254c272768..ea5867df3a4e7b90420be77d9113d0e29cbf388c 100644 |
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h |
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h |
@@ -43,7 +43,7 @@ class MockInputMethodManager : public InputMethodManager { |
virtual bool EnableInputMethod( |
const std::string& new_active_input_method_id) OVERRIDE; |
virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE; |
- virtual void ActivateInputMethodProperty(const std::string& key) OVERRIDE; |
+ virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE; |
virtual void AddInputMethodExtension( |
const std::string& id, |
InputMethodEngineInterface* instance) OVERRIDE; |
@@ -57,10 +57,6 @@ class MockInputMethodManager : public InputMethodManager { |
const ui::Accelerator& accelerator) OVERRIDE; |
virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE; |
virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE; |
- virtual InputMethodPropertyList |
- GetCurrentInputMethodProperties() const OVERRIDE; |
- virtual void SetCurrentInputMethodProperties( |
- const InputMethodPropertyList& property_list) OVERRIDE; |
virtual XKeyboard* GetXKeyboard() OVERRIDE; |
virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE; |
virtual ComponentExtensionIMEManager* |