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

trunk/src/chrome/browser/chromeos/input_method/input_method_engine.h

Index: trunk/src/chrome/browser/chromeos/input_method/input_method_engine.h
===================================================================
--- trunk/src/chrome/browser/chromeos/input_method/input_method_engine.h	(revision 251193)
+++ trunk/src/chrome/browser/chromeos/input_method/input_method_engine.h	(working copy)
@@ -17,17 +17,12 @@
 class KeyEvent;
 }  // namespace ui
 
-namespace ash {
-namespace ime {
-struct InputMethodMenuItem;
-}  // namespace ime
-}  // namespace ash
-
 namespace chromeos {
 
 class CompositionText;
 
 namespace input_method {
+struct InputMethodProperty;
 struct KeyEventHandle;
 }  // namespace input_method
 
@@ -100,9 +95,9 @@
   virtual void HideInputView() OVERRIDE;
 
  private:
-  // Converts MenuItem to InputMethodMenuItem.
+  // Converts MenuItem to InputMethodProperty.
   void MenuItemToProperty(const MenuItem& item,
-                          ash::ime::InputMethodMenuItem* property);
+                          input_method::InputMethodProperty* property);
 
   // Descriptor of this input method.
   input_method::InputMethodDescriptor descriptor_;