Delete IBusClient.

chrome/browser/chromeos/input_method/input_method_engine_ibus.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_engine_ibus.h"
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/ibus/ibus_component.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "chromeos/ime/candidate_window.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/ibus_keymap.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "dbus/object_path.h"
@@ skipping 78 matching lines @@
   IBusComponent::EngineDescription engine_desc;
   engine_desc.engine_id = ibus_id_;
   engine_desc.display_name = description;
   engine_desc.description = description;
   engine_desc.language_code = (languages.empty()) ? "" : languages[0];
   engine_desc.author = ibus_id_;
 
   component_->mutable_engine_description()->push_back(engine_desc);
   manager->AddInputMethodExtension(ibus_id_, engine_name, layouts, languages,
                                    options_page, input_view, this);
-  // If connection is avaiable, register component. If there are no connection
-  // to ibus-daemon, OnConnected callback will register component instead.
-  if (IsConnected())
-    RegisterComponent();
+  RegisterComponent();
 }
 
 void InputMethodEngineIBus::StartIme() {
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   if (manager && ibus_id_ == manager->GetCurrentInputMethod().id())
     Enable();
 }
 
 bool InputMethodEngineIBus::SetComposition(
@@ skipping 462 matching lines @@
   // TODO(nona): Support item.children.
 }
 
 void InputMethodEngineIBus::OnConnected() {
   RegisterComponent();
 }
 
 void InputMethodEngineIBus::OnDisconnected() {
 }
 
-bool InputMethodEngineIBus::IsConnected() {
-  return DBusThreadManager::Get()->GetIBusClient() != NULL;
-}
-
 void InputMethodEngineIBus::RegisterComponent() {
-  IBusClient* client = DBusThreadManager::Get()->GetIBusClient();
-  client->RegisterComponent(
-      *component_.get(),
-      base::Bind(&InputMethodEngineIBus::OnComponentRegistered,
-                 weak_ptr_factory_.GetWeakPtr()),
-      base::Bind(&InputMethodEngineIBus::OnComponentRegistrationFailed,
-                 weak_ptr_factory_.GetWeakPtr()));
-}
-
-void InputMethodEngineIBus::OnComponentRegistered() {
   ibus_engine_factory_service_->SetCreateEngineHandler(
       ibus_id_,
       base::Bind(&InputMethodEngineIBus::CreateEngineHandler,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void InputMethodEngineIBus::OnComponentRegistrationFailed() {
-  DVLOG(1) << "Failed to register input method components.";
-  // TODO(nona): Implement error handling.
-}
-
 void InputMethodEngineIBus::CreateEngineHandler(
     const IBusEngineFactoryService::CreateEngineResponseSender& sender) {
   GetCurrentService()->UnsetEngine(this);
   ibus_engine_service_.reset();
   object_path_ = ibus_engine_factory_service_->GenerateUniqueObjectPath();
 
   GetCurrentService()->SetEngine(this);
   sender.Run(object_path_);
 }
 
 }  // namespace chromeos