Refactoring for InputMethodEngine and InputMethodEventRouter.

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>
@@ skipping 22 matching lines @@
 namespace input_method {
 struct KeyEventHandle;
 }  // namespace input_method
 
 class InputMethodEngine : public InputMethodEngineInterface {
  public:
   InputMethodEngine();
 
   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,
                               int selection_end,
                               int cursor,
                               const std::vector<SegmentInfo>& segments,
                               std::string* error) OVERRIDE;
   virtual bool ClearComposition(int context_id, std::string* error) OVERRIDE;
   virtual bool CommitText(int context_id, const char* text,
                           std::string* error) OVERRIDE;
@@ skipping 15 matching lines @@
   virtual bool IsActive() const OVERRIDE;
   virtual bool DeleteSurroundingText(int context_id,
                                      int offset,
                                      size_t number_of_chars,
                                      std::string* error) OVERRIDE;
 
   // IMEEngineHandlerInterface overrides.
   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;
   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:
   void RecordHistogram(const char* name, int count);
 
   // Converts MenuItem to InputMethodMenuItem.
   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_;
 
   // The current preedit text, and it's cursor position.
   scoped_ptr<CompositionText> composition_text_;
   int composition_cursor_;
 
   // The current candidate window.
   scoped_ptr<ui::CandidateWindow> candidate_window_;
 
   // The current candidate window property.
   CandidateWindowProperty candidate_window_property_;
 
   // Indicates whether the candidate window is visible.
   bool window_visible_;
 
   // Mapping of candidate index to candidate id.
   std::vector<int> candidate_ids_;
 
   // 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_;
 
   // 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
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_