Remove libibus dependency from config relate stuff.

chromeos/dbus/dbus_thread_manager.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 "chromeos/dbus/dbus_thread_manager.h"
 
 #include <map>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_ipconfig_client.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_network_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
+#include "chromeos/dbus/ibus/ibus_config_client.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "chromeos/dbus/ibus/ibus_panel_service.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
 #include "chromeos/dbus/permission_broker_client.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/root_power_manager_client.h"
@@ skipping 133 matching lines @@
     ibus_bus_ = new dbus::Bus(ibus_bus_options);
     ibus_address_ = ibus_address;
     VLOG(1) << "Connected to ibus-daemon: " << ibus_address;
 
     DBusClientImplementationType client_type =
         base::chromeos::IsRunningOnChromeOS() ? REAL_DBUS_CLIENT_IMPLEMENTATION
                                               : STUB_DBUS_CLIENT_IMPLEMENTATION;
 
     ibus_client_.reset(
         IBusClient::Create(client_type, ibus_bus_.get()));
+    ibus_config_client_.reset(
+        IBusConfigClient::Create(client_type, ibus_bus_.get()));
     ibus_input_context_client_.reset(
         IBusInputContextClient::Create(client_type));
     ibus_engine_factory_service_.reset(
         IBusEngineFactoryService::Create(ibus_bus_.get(), client_type));
     ibus_panel_service_.reset(
         ibus::IBusPanelService::Create(client_type, ibus_bus_.get()));
 
     ibus_engine_services_.clear();
   }
 
@@ skipping 107 matching lines @@
   }
 
   virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE {
     return update_engine_client_.get();
   }
 
   virtual IBusClient* GetIBusClient() OVERRIDE {
     return ibus_client_.get();
   }
 
+  virtual IBusConfigClient* GetIBusConfigClient() OVERRIDE {
+    return ibus_config_client_.get();
+  }
+
   virtual IBusInputContextClient* GetIBusInputContextClient() OVERRIDE {
     return ibus_input_context_client_.get();
   }
 
   virtual IBusEngineFactoryService* GetIBusEngineFactoryService() OVERRIDE {
     return ibus_engine_factory_service_.get();
   }
 
   virtual IBusEngineService* GetIBusEngineService(
       const dbus::ObjectPath& object_path) OVERRIDE {
@@ skipping 47 matching lines @@
   scoped_ptr<IntrospectableClient> introspectable_client_;
   scoped_ptr<ModemMessagingClient> modem_messaging_client_;
   scoped_ptr<PermissionBrokerClient> permission_broker_client_;
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<RootPowerManagerClient> root_power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;
   scoped_ptr<SMSClient> sms_client_;
   scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_;
   scoped_ptr<UpdateEngineClient> update_engine_client_;
   scoped_ptr<IBusClient> ibus_client_;
+  scoped_ptr<IBusConfigClient> ibus_config_client_;
   scoped_ptr<IBusInputContextClient> ibus_input_context_client_;
   scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_;
   std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_;
   scoped_ptr<ibus::IBusPanelService> ibus_panel_service_;
 
   std::string ibus_address_;
 
   ObserverList<DBusThreadManagerObserver> observers_;
 };
 
@@ skipping 63 matching lines @@
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos