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 794db451ecd166e9a14a44a53601afe0fa7826aa..b6a757e7944cac099f66c2856f71745a4f5c69b7 100644 |
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h |
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h |
@@ -44,7 +44,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; |
@@ -58,10 +58,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* |