Replace InputMethodEngineIBus.

chrome/browser/chromeos/input_method/input_method_manager_impl.cc

 // 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.
 
 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 
 #include <algorithm>  // std::find
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.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/input_method_engine_ibus.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "unicode/uloc.h"
 
 namespace chromeos {
 namespace input_method {
 
 namespace {
@@ skipping 260 matching lines @@
 void InputMethodManagerImpl::ActivateInputMethodProperty(
     const std::string& key) {
   DCHECK(!key.empty());
   ibus_controller_->ActivateInputMethodProperty(key);
 }
 
 void InputMethodManagerImpl::AddInputMethodExtension(
     const std::string& id,
     const std::string& name,
     const std::vector<std::string>& layouts,
-    const std::string& language) {
+    const std::string& language,
+    InputMethodEngine* engine) {
   if (state_ == STATE_TERMINATING)
     return;
 
   if (!InputMethodUtil::IsExtensionInputMethod(id)) {
     DVLOG(1) << id << " is not a valid extension input method ID.";
     return;
   }
 
   const std::string layout = layouts.empty() ? "" : layouts[0];
   extra_input_methods_[id] =
       InputMethodDescriptor(id, name, layout, language, true);
 
   if (!Contains(active_input_method_ids_, id)) {
     active_input_method_ids_.push_back(id);
   } else {
     DVLOG(1) << "AddInputMethodExtension: alread added: "
              << id << ", " << name;
     // Call Start() anyway, just in case.
   }
 
   // Ensure that the input method daemon is running.
   MaybeInitializeCandidateWindowController();
   ibus_controller_->Start();
+
+  extra_input_method_instances_[id] =
+      static_cast<InputMethodEngineIBus*>(engine);
 }
 
 void InputMethodManagerImpl::RemoveInputMethodExtension(const std::string& id) {
   if (!InputMethodUtil::IsExtensionInputMethod(id))
     DVLOG(1) << id << " is not a valid extension input method ID.";
 
   std::vector<std::string>::iterator i = std::find(
       active_input_method_ids_.begin(), active_input_method_ids_.end(), id);
   if (i != active_input_method_ids_.end())
     active_input_method_ids_.erase(i);
   extra_input_methods_.erase(id);
 
   if (ContainOnlyKeyboardLayout(active_input_method_ids_)) {
     // Do NOT call ibus_controller_->Stop(); here to work around a crash issue
     // at crosbug.com/27051.
     // TODO(yusukes): We can safely call Stop(); here once crosbug.com/26443
     // is implemented.
   }
 
   // If |current_input_method| is no longer in |active_input_method_ids_|,
   // switch to the first one in |active_input_method_ids_|.
   ChangeInputMethod(current_input_method_.id());
+
+  std::map<std::string, InputMethodEngineIBus*>::iterator ite =
+      extra_input_method_instances_.find(id);
+  if (ite == extra_input_method_instances_.end()) {
+    DVLOG(1) << "The engine instance of " << id << " has already gone.";
+  } else {
+    // Do NOT release the actual instance here. This class does not take an
+    // onwership of engine instance.
+    extra_input_method_instances_.erase(ite);
+  }
 }
 
 bool InputMethodManagerImpl::SwitchToNextInputMethod() {
   // Sanity checks.
   if (active_input_method_ids_.empty()) {
     DVLOG(1) << "active input method is empty";
     return false;
   }
   if (current_input_method_.id().empty()) {
     DVLOG(1) << "current_input_method_ is unknown";
@@ skipping 115 matching lines @@
 }
 
 XKeyboard* InputMethodManagerImpl::GetXKeyboard() {
   return xkeyboard_.get();
 }
 
 InputMethodUtil* InputMethodManagerImpl::GetInputMethodUtil() {
   return &util_;
 }
 
+void InputMethodManagerImpl::OnConnected() {
+  for (std::map<std::string, InputMethodEngineIBus*>::iterator ite =
+          extra_input_method_instances_.begin();
+       ite != extra_input_method_instances_.end();
+       ite++) {
+    ite->second->OnConnected();
+  }
+}
+
+void InputMethodManagerImpl::OnDisconnected() {
+  for (std::map<std::string, InputMethodEngineIBus*>::iterator ite =
+          extra_input_method_instances_.begin();
+       ite != extra_input_method_instances_.end();
+       ite++) {
+    ite->second->OnDisconnected();
+  }
+}
+
 void InputMethodManagerImpl::Init() {
   DCHECK(!ibus_controller_.get());
 
   browser_state_monitor_.reset(new BrowserStateMonitor(this));
   ibus_controller_.reset(IBusController::Create());
   xkeyboard_.reset(XKeyboard::Create(util_));
   ibus_controller_->AddObserver(this);
 }
 
 void InputMethodManagerImpl::SetIBusControllerForTesting(
@@ skipping 93 matching lines @@
     DVLOG(1) << "Failed to initialize the candidate window controller";
 }
 
 // static
 InputMethodManagerImpl* InputMethodManagerImpl::GetInstanceForTesting() {
   return new InputMethodManagerImpl;
 }
 
 }  // namespace input_method
 }  // namespace chromeos