Revert 251327 "Reland of: Split out InputMethodMenuManager from ..."

> Reland of: Split out InputMethodMenuManager from InputMethodManager.
> 
> Rename input_method_property to input_method_menu_item, and move to ash/ime.
> 
> This is a reland of https://codereview.chromium.org/150203015,reverted by https://codereview.chromium.org/165453002
> 
> Use Singleton<> instead of trying to maintain my own singleton.
> 
> BUG=342336, 343044
> 
> Review URL: https://codereview.chromium.org/165783002

TBR=uekawa@chromium.org

Review URL: https://codereview.chromium.org/167823002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251436 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 1 deletions

diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
index 5d55d7b..8c0594f 100644
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc
@@ -91,7 +91,7 @@ void MockInputMethodManager::ChangeInputMethod(
     const std::string& input_method_id) {
 }
 
-void MockInputMethodManager::ActivateInputMethodMenuItem(
+void MockInputMethodManager::ActivateInputMethodProperty(
     const std::string& key) {
 }
 
@@ -144,6 +144,15 @@ InputMethodDescriptor MockInputMethodManager::GetCurrentInputMethod() const {
   return descriptor;
 }
 
+InputMethodPropertyList
+MockInputMethodManager::GetCurrentInputMethodProperties() const {
+  return InputMethodPropertyList();
+}
+
+void MockInputMethodManager::SetCurrentInputMethodProperties(
+    const InputMethodPropertyList& property_list) {
+}
+
 XKeyboard* MockInputMethodManager::GetXKeyboard() {
   return &xkeyboard_;
 }