Delete IBusClient.

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/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_delegate.h"
 #include "chromeos/ime/xkeyboard.h"
 #include "third_party/icu/source/common/unicode/uloc.h"
 #include "ui/base/accelerators/accelerator.h"
 
 namespace chromeos {
 namespace input_method {
 
@@ skipping 256 matching lines @@
     scoped_ptr<InputMethodDescriptors> input_methods(GetActiveInputMethods());
     DCHECK(!input_methods->empty());
     input_method_id_to_switch = input_methods->at(0).id();
     if (!input_method_id.empty()) {
       DVLOG(1) << "Can't change the current input method to "
                << input_method_id << " since the engine is not enabled. "
                << "Switch to " << input_method_id_to_switch << " instead.";
     }
   }
 
-  if (!component_extension_ime_manager_->IsInitialized() ||
-      (!InputMethodUtil::IsKeyboardLayout(input_method_id_to_switch) &&
-       !IsIBusConnectionAlive())) {
-    // We can't change input method before the initialization of component
-    // extension ime manager or before connection to ibus-daemon is not
-    // established. ChangeInputMethod will be called with
-    // |pending_input_method_| when the both initialization is done.
+  if (!component_extension_ime_manager_->IsInitialized()) {
+    // We can't change input method before the initialization of
+    // component extension ime manager.  ChangeInputMethod will be
+    // called with |pending_input_method_| when the initialization is
+    // done.
     pending_input_method_ = input_method_id_to_switch;
     return false;
   }
 
   pending_input_method_.clear();
   IBusEngineHandlerInterface* engine = IBusBridge::Get()->GetEngineHandler();
   const std::string current_input_method_id = current_input_method_.id();
-  IBusClient* client = DBusThreadManager::Get()->GetIBusClient();
   if (InputMethodUtil::IsKeyboardLayout(input_method_id_to_switch)) {
     FOR_EACH_OBSERVER(InputMethodManager::Observer,
                       observers_,
                       InputMethodPropertyChanged(this));
     if (engine) {
       engine->Disable();
       IBusBridge::Get()->SetEngineHandler(NULL);
     }
   } else {
-    DCHECK(client);
-    client->SetGlobalEngine(input_method_id_to_switch,
-                            base::Bind(&base::DoNothing));
+    // Disable the current engine and enable the next engine.
+    IBusEngineHandlerInterface* previous_engine =

[Seigo Nonaka, 2013/11/12 03:21:45]

Can we reuse |engine| for this?
Or please move L308 to L314

[Hiro Komatsu, 2013/11/12 04:34:24]

Done.

+        IBusBridge::Get()->GetEngineHandler();
+    if (previous_engine)
+      previous_engine->Disable();
+    IBusBridge::Get()->CreateEngine(input_method_id_to_switch);

[Seigo Nonaka, 2013/11/12 03:21:45]

FYI: CreateEngine is no longer necessary because ExtensionIME instances are
stored in as |extra_input_method_instances_| in InputMethodManager. So that this
is actually no-op for Chrome OS.
Please also consider to remove CreateEngine.

[Hiro Komatsu, 2013/11/12 04:34:24]

ACK.  I will try to remove CreateEngine in the following patches.

+    IBusEngineHandlerInterface* next_engine =
+        IBusBridge::Get()->GetEngineHandler();
+    IBusBridge::Get()->SetEngineHandler(next_engine);
+    if (next_engine)
+      next_engine->Enable();
   }
 
   if (current_input_method_id != input_method_id_to_switch) {
     // Clear input method properties unconditionally if
     // |input_method_id_to_switch| is not equal to |current_input_method_id|.
     //
     // When switching to another input method and no text area is focused,
     // RegisterProperties signal for the new input method will NOT be sent
     // until a text area is focused. Therefore, we have to clear the old input
     // method properties here to keep the input method switcher status
@@ skipping 522 matching lines @@
     return;
 
   candidate_window_controller_.reset(
       CandidateWindowController::CreateCandidateWindowController());
   if (candidate_window_controller_->Init())
     candidate_window_controller_->AddObserver(this);
   else
     DVLOG(1) << "Failed to initialize the candidate window controller";
 }
 
-bool InputMethodManagerImpl::IsIBusConnectionAlive() {
-  return DBusThreadManager::Get() && DBusThreadManager::Get()->GetIBusClient();
-}
-
 }  // namespace input_method
 }  // namespace chromeos