Refactoring for InputMethodEngine and InputMethodEventRouter.

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 22a800604b0c0179ee3343962beac25d0feb1dd2..9aa6364309f92f62e5099533f75059485da596a0 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.h
+++ b/chrome/browser/chromeos/input_method/input_method_engine.h
@@ -40,20 +40,11 @@ class InputMethodEngine : public InputMethodEngineInterface {
 
   virtual ~InputMethodEngine();
 
-  void Initialize(Profile* profile,
-                  scoped_ptr<InputMethodEngineInterface::Observer> observer,
-                  const char* engine_name,
-                  const char* extension_id,
-                  const char* engine_id,
-                  const std::vector<std::string>& languages,
-                  const std::vector<std::string>& layouts,
-                  const GURL& options_page,
-                  const GURL& input_view);
+  void Initialize(scoped_ptr<InputMethodEngineInterface::Observer> observer,
+                  const char* extension_id);
 
   // InputMethodEngineInterface overrides.
-  virtual const input_method::InputMethodDescriptor& GetDescriptor()
-      const OVERRIDE;
-  virtual void NotifyImeReady() OVERRIDE;
+  virtual const std::string& GetActiveComponentId() const OVERRIDE;
   virtual bool SetComposition(int context_id,
                               const char* text,
                               int selection_start,
@@ -89,7 +80,7 @@ class InputMethodEngine : public InputMethodEngineInterface {
   virtual void FocusIn(
       const IMEEngineHandlerInterface::InputContext& input_context) OVERRIDE;
   virtual void FocusOut() OVERRIDE;
-  virtual void Enable() OVERRIDE;
+  virtual void Enable(const std::string& component_id) OVERRIDE;
   virtual void Disable() OVERRIDE;
   virtual void PropertyActivate(const std::string& property_name) OVERRIDE;
   virtual void Reset() OVERRIDE;
@@ -107,32 +98,23 @@ class InputMethodEngine : public InputMethodEngineInterface {
   void MenuItemToProperty(const MenuItem& item,
                           ash::ime::InputMethodMenuItem* property);
 
-  // Enables or disables overriding input view page to Virtual Keyboard window.
-  void EnableInputView(bool enabled);
-
-  // Descriptor of this input method.
-  input_method::InputMethodDescriptor descriptor_;
+  // Enables overriding input view page to Virtual Keyboard window.
+  void EnableInputView();
 
   ui::TextInputType current_input_type_;
 
-  // True if this engine is active.
-  bool active_;
-
   // ID that is used for the current input context.  False if there is no focus.
   int context_id_;
 
   // Next id that will be assigned to a context.
   int next_context_id_;
 
-  // This IME ID in Chrome Extension.
-  std::string engine_id_;
+  // The input_component ID in IME extension's manifest.
+  std::string active_component_id_;
 
-  // This IME's Chrome Extension ID.
+  // The IME extension ID.
   std::string extension_id_;
 
-  // This IME ID in InputMethodManager.
-  std::string imm_id_;
-
   // The observer object recieving events for this IME.
   scoped_ptr<InputMethodEngineInterface::Observer> observer_;
 
@@ -155,9 +137,6 @@ class InputMethodEngine : public InputMethodEngineInterface {
   // Mapping of candidate id to index.
   std::map<int, int> candidate_indexes_;
 
-  // Used for input view window.
-  GURL input_view_url_;
-
   // Used with SendKeyEvents and ProcessKeyEvent to check if the key event
   // sent to ProcessKeyEvent is sent by SendKeyEvents.
   const ui::KeyEvent* sent_key_event_;
@@ -165,9 +144,6 @@ class InputMethodEngine : public InputMethodEngineInterface {
   // The start & end time of using this input method. This is for UMA.
   base::Time start_time_;
   base::Time end_time_;
-
-  // User profile that owns this method.
-  Profile* profile_;
 };
 
 }  // namespace chromeos