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

Unified Diff: chromeos/dbus/dbus_thread_manager.cc

Issue 14048007: Bluetooth: D-Bus client interface for org.bluez.Input1 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: interface deletion order fixed. Created 7 years, 8 months 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/experimental_bluetooth_input_client.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 95dd2432e70e0e7ffdfd7a991e7e4e7e29595987..8b521e505f366d93c00288f8a391057d82acd527 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -26,6 +26,7 @@
#include "chromeos/dbus/experimental_bluetooth_adapter_client.h"
#include "chromeos/dbus/experimental_bluetooth_agent_manager_client.h"
#include "chromeos/dbus/experimental_bluetooth_device_client.h"
+#include "chromeos/dbus/experimental_bluetooth_input_client.h"
#include "chromeos/dbus/experimental_bluetooth_profile_manager_client.h"
#include "chromeos/dbus/gsm_sms_client.h"
#include "chromeos/dbus/shill_device_client.h"
@@ -118,6 +119,9 @@ class DBusThreadManagerImpl : public DBusThreadManager {
experimental_bluetooth_device_client_.reset(
ExperimentalBluetoothDeviceClient::Create(
client_type_, system_bus_.get()));
+ experimental_bluetooth_input_client_.reset(
+ ExperimentalBluetoothInputClient::Create(
+ client_type_, system_bus_.get()));
experimental_bluetooth_profile_manager_client_.reset(
ExperimentalBluetoothProfileManagerClient::Create(
client_type_, system_bus_.get()));
@@ -296,6 +300,11 @@ class DBusThreadManagerImpl : public DBusThreadManager {
return experimental_bluetooth_device_client_.get();
}
+ virtual ExperimentalBluetoothInputClient*
+ GetExperimentalBluetoothInputClient() OVERRIDE {
+ return experimental_bluetooth_input_client_.get();
+ }
+
virtual ExperimentalBluetoothProfileManagerClient*
GetExperimentalBluetoothProfileManagerClient() OVERRIDE {
return experimental_bluetooth_profile_manager_client_.get();
@@ -436,6 +445,8 @@ class DBusThreadManagerImpl : public DBusThreadManager {
experimental_bluetooth_agent_manager_client_;
scoped_ptr<ExperimentalBluetoothDeviceClient>
experimental_bluetooth_device_client_;
+ scoped_ptr<ExperimentalBluetoothInputClient>
+ experimental_bluetooth_input_client_;
scoped_ptr<ExperimentalBluetoothProfileManagerClient>
experimental_bluetooth_profile_manager_client_;
scoped_ptr<ShillDeviceClient> shill_device_client_;
« no previous file with comments | « chromeos/dbus/dbus_thread_manager.h ('k') | chromeos/dbus/experimental_bluetooth_input_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698