Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: chromeos/dbus/dbus_thread_manager.cc

Issue 11419202: Remove libibus dependency from config relate stuff. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/dbus_thread_manager.h ('k') | chromeos/dbus/mock_dbus_thread_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/dbus_thread_manager.cc
diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index f72e6a05bba892bc6142636f1843a5a0a8f2bb34..ff712e6e9b92f5f5d094cf0aa9115a8e6004ef6b 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -30,6 +30,7 @@
#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"
@@ -183,6 +184,8 @@ class DBusThreadManagerImpl : public DBusThreadManager {
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(
@@ -310,6 +313,10 @@ class DBusThreadManagerImpl : public DBusThreadManager {
return ibus_client_.get();
}
+ virtual IBusConfigClient* GetIBusConfigClient() OVERRIDE {
+ return ibus_config_client_.get();
+ }
+
virtual IBusInputContextClient* GetIBusInputContextClient() OVERRIDE {
return ibus_input_context_client_.get();
}
@@ -377,6 +384,7 @@ class DBusThreadManagerImpl : public DBusThreadManager {
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_;
« no previous file with comments | « chromeos/dbus/dbus_thread_manager.h ('k') | chromeos/dbus/mock_dbus_thread_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698