Revert 251164 "Split out InputMethodMenuManager from InputMethod..."

> Split out InputMethodMenuManager from InputMethodManager.
> 
> Rename input_method_property to input_method_menu_item, and move to ash/ime.
> 
> BUG=342336, 343044
> 
> Review URL: https://codereview.chromium.org/150203015

I'm reverting as test appears to be consistently failing:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/39558/steps/ash_unittests/logs/TestUninitializedGet

InputMethodMenuManagerTest.TestUninitializedGet (run #1):
[ RUN      ] InputMethodMenuManagerTest.TestUninitializedGet

[WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death
tests use fork(), which is unsafe particularly in a threaded
context. For this test, Google Test couldn't detect the number of
threads.
../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure
Death test: InputMethodMenuManager::Get()
    Result: failed to die.
 Error msg:
[  DEATH   ] 
[  FAILED  ] InputMethodMenuManagerTest.TestUninitializedGet (4 ms)

InputMethodMenuManagerTest.TestUninitializedGet (run #2):
[ RUN      ] InputMethodMenuManagerTest.TestUninitializedGet

[WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death
tests use fork(), which is unsafe particularly in a threaded
context. For this test, Google Test couldn't detect the number of
threads.
../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure
Death test: InputMethodMenuManager::Get()
    Result: failed to die.
 Error msg:
[  DEATH   ] 
[  FAILED  ] InputMethodMenuManagerTest.TestUninitializedGet (2 ms)

InputMethodMenuManagerTest.TestUninitializedGet (run #3):
[ RUN      ] InputMethodMenuManagerTest.TestUninitializedGet

[WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death
tests use fork(), which is unsafe particularly in a threaded
context. For this test, Google Test couldn't detect the number of
threads.
../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure
Death test: InputMethodMenuManager::Get()
    Result: failed to die.
 Error msg:
[  DEATH   ] 
[  FAILED  ] InputMethodMenuManagerTest.TestUninitializedGet (2 ms)

InputMethodMenuManagerTest.TestUninitializedGet (run #4):
[ RUN      ] InputMethodMenuManagerTest.TestUninitializedGet

[WARNING] ../../testing/gtest/src/gtest-death-test.cc:825:: Death
tests use fork(), which is unsafe particularly in a threaded
context. For this test, Google Test couldn't detect the number of
threads.
../../ash/ime/input_method_menu_manager_unittest.cc:16: Failure
Death test: InputMethodMenuManager::Get()
    Result: failed to die.
 Error msg:
[  DEATH   ] 
[  FAILED  ] InputMethodMenuManagerTest.TestUninitializedGet (1 ms)

TBR=uekawa@chromium.org

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

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

1 files changed, 11 insertions, 1 deletions

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 5716704..f24152e 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -66,7 +66,7 @@ class InputMethodManagerImpl : 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 ActivateInputMethodMenuItem(const std::string& key) OVERRIDE;
+  virtual void ActivateInputMethodProperty(const std::string& key) OVERRIDE;
   virtual void AddInputMethodExtension(
       const std::string& id,
       InputMethodEngineInterface* instance) OVERRIDE;
@@ -80,6 +80,10 @@ class InputMethodManagerImpl : 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;
@@ -97,6 +101,9 @@ class InputMethodManagerImpl : public InputMethodManager,
       scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate);
 
  private:
+  // Notifies observers that the property list is updated.
+  void PropertyChanged();
+
   // CandidateWindowController::Observer overrides:
   virtual void CandidateClicked(int index) OVERRIDE;
   virtual void CandidateWindowOpened() OVERRIDE;
@@ -182,6 +189,9 @@ class InputMethodManagerImpl : public InputMethodManager,
   // those created by extension.
   std::map<std::string, InputMethodDescriptor> extra_input_methods_;
 
+  // Property list of the input method.  This is set by extension IMEs.
+  InputMethodPropertyList property_list_;
+
   // The candidate window.  This will be deleted when the APP_TERMINATING
   // message is sent.
   scoped_ptr<CandidateWindowController> candidate_window_controller_;