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

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 #include "chrome/browser/chromeos/input_method/input_method_engine_interface.h"
 #include "chromeos/ime/input_method_descriptor.h"
 #include "url/gurl.h"
 
 namespace ui {
 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
 
 class InputMethodEngine : public InputMethodEngineInterface {
  public:
   InputMethodEngine();
 
   virtual ~InputMethodEngine();
 
   void Initialize(
@@ skipping 52 matching lines @@
   virtual void PropertyActivate(const std::string& property_name) OVERRIDE;
   virtual void Reset() OVERRIDE;
   virtual void ProcessKeyEvent(const ui::KeyEvent& key_event,
                                const KeyEventDoneCallback& callback) OVERRIDE;
   virtual void CandidateClicked(uint32 index) OVERRIDE;
   virtual void SetSurroundingText(const std::string& text, uint32 cursor_pos,
                                   uint32 anchor_pos) OVERRIDE;
   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_;
 
   // True if the current context has focus.
   bool focused_;
 
   // True if this engine is active.
   bool active_;
 
@@ skipping 31 matching lines @@
   // Mapping of candidate id to index.
   std::map<int, int> candidate_indexes_;
 
   // Used for input view window.
   GURL input_view_url_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_