Reland of: Split out InputMethodMenuManager from InputMethodManager.

chrome/browser/chromeos/input_method/input_method_engine.h

Index: chrome/browser/chromeos/input_method/input_method_engine.h
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.h b/chrome/browser/chromeos/input_method/input_method_engine.h
index ce817d389c31f01755e3231e2b15beb8acbaf0e9..64dd8e292e3aa7804cc3bb2b7dcdcd4fe13eb613 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.h
+++ b/chrome/browser/chromeos/input_method/input_method_engine.h
@@ -17,12 +17,17 @@ class CandidateWindow;
 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
 
@@ -95,9 +100,9 @@ class InputMethodEngine : public InputMethodEngineInterface {
   virtual void HideInputView() OVERRIDE;
 
  private:
-  // Converts MenuItem to InputMethodProperty.
+  // Converts MenuItem to InputMethodMenuItem.
   void MenuItemToProperty(const MenuItem& item,
-                          input_method::InputMethodProperty* property);
+                          ash::ime::InputMethodMenuItem* property);
 
   // Descriptor of this input method.
   input_method::InputMethodDescriptor descriptor_;