Replace InputMethodEngineIBus.

chrome/browser/chromeos/input_method/input_method_manager_impl.h

 // Copyright (c) 2012 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_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/observer_list.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/input_method/browser_state_monitor.h"
 #include "chrome/browser/chromeos/input_method/candidate_window.h"
 #include "chrome/browser/chromeos/input_method/ibus_controller.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 
 namespace chromeos {
+class InputMethodEngineIBus;
 namespace input_method {
 
 // The implementation of InputMethodManager.
 class InputMethodManagerImpl : public InputMethodManager,
                                public CandidateWindowController::Observer,
                                public IBusController::Observer {
  public:
   virtual ~InputMethodManagerImpl();
 
   // InputMethodManager override:
@@ skipping 14 matching lines @@
   virtual bool SetInputMethodConfig(
       const std::string& section,
       const std::string& config_name,
       const InputMethodConfigValue& value) OVERRIDE;
   virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE;
   virtual void ActivateInputMethodProperty(const std::string& key) OVERRIDE;
   virtual void AddInputMethodExtension(
       const std::string& id,
       const std::string& name,
       const std::vector<std::string>& layouts,
-      const std::string& language) OVERRIDE;
+      const std::string& language,
+      InputMethodEngine* instance) OVERRIDE;
   virtual void RemoveInputMethodExtension(const std::string& id) OVERRIDE;
   virtual bool SwitchToNextInputMethod() OVERRIDE;
   virtual bool SwitchToPreviousInputMethod() OVERRIDE;
   virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE;
   virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE;
   virtual InputMethodPropertyList
       GetCurrentInputMethodProperties() const OVERRIDE;
   virtual XKeyboard* GetXKeyboard() OVERRIDE;
   virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE;
 
   // Sets |ibus_controller_|.
   void SetIBusControllerForTesting(IBusController* ibus_controller);
   // Sets |candidate_window_controller_|.
   void SetCandidateWindowControllerForTesting(
       CandidateWindowController* candidate_window_controller);
   // Sets |xkeyboard_|.
   void SetXKeyboardForTesting(XKeyboard* xkeyboard);
 
   // Creates a new instance of this class. The caller has to delete the returned
   // object. The caller also have to set a mock CandidateWindowController,
   // IBusController, and XKeyboard. See the setters above.
   static InputMethodManagerImpl* GetInstanceForTesting();
 
  private:
   friend class InputMethodManager;
   InputMethodManagerImpl();
 
   // IBusController overrides:
   virtual void PropertyChanged() OVERRIDE;
+  virtual void OnConnected() OVERRIDE;
+  virtual void OnDisconnected() OVERRIDE;
+
 
   // CandidateWindowController::Observer overrides:
   virtual void CandidateWindowOpened() OVERRIDE;
   virtual void CandidateWindowClosed() OVERRIDE;
 
   // Attach IBusController, CandidateWindowController, and XKeyboard objects
   // to the InputMethodManagerImpl object. You don't have to call this function
   // if you attach them yourself (e.g. in unit tests) using the setters above.
   void Init();
 
@@ skipping 44 matching lines @@
   // For screen locker. When the screen is locked, |previous_input_method_|,
   // |current_input_method_|, and |active_input_method_ids_| above are copied
   // to these "saved" variables.
   InputMethodDescriptor saved_previous_input_method_;
   InputMethodDescriptor saved_current_input_method_;
   std::vector<std::string> saved_active_input_method_ids_;
 
   // Extra input methods that have been explicitly added to the menu, such as
   // those created by extension.
   std::map<std::string, InputMethodDescriptor> extra_input_methods_;
+  std::map<std::string, InputMethodEngineIBus*> extra_input_method_instances_;
 
   // The browser state monitor is used to receive notifications from the browser
   // and call SetState() method of |this| class.
   scoped_ptr<BrowserStateMonitor> browser_state_monitor_;
 
   // The IBus controller is used to control the input method status and
   // allow callbacks when the input method status changes.
   scoped_ptr<IBusController> ibus_controller_;
 
   // The candidate window.  This will be deleted when the APP_TERMINATING
@@ skipping 11 matching lines @@
   // auto-repeat interval.
   scoped_ptr<XKeyboard> xkeyboard_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_