| Index: chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
|
| index 6db36c27d521fee6e5319842985d512925907bff..19d761d2d80b44a94aa9191d0d80fcd2a8512e8b 100644
|
| --- a/chromeos/dbus/dbus_thread_manager.cc
|
| +++ b/chromeos/dbus/dbus_thread_manager.cc
|
| @@ -12,6 +12,7 @@
|
| #include "chromeos/dbus/ap_manager_client.h"
|
| #include "chromeos/dbus/audio_dsp_client.h"
|
| #include "chromeos/dbus/bluetooth_adapter_client.h"
|
| +#include "chromeos/dbus/bluetooth_advertisement_manager_client.h"
|
| #include "chromeos/dbus/bluetooth_agent_manager_client.h"
|
| #include "chromeos/dbus/bluetooth_device_client.h"
|
| #include "chromeos/dbus/bluetooth_gatt_characteristic_client.h"
|
| @@ -132,6 +133,11 @@ BluetoothAdapterClient* DBusThreadManager::GetBluetoothAdapterClient() {
|
| return client_bundle_->bluetooth_adapter_client();
|
| }
|
|
|
| +BluetoothAdvertisementManagerClient*
|
| +DBusThreadManager::GetBluetoothAdvertisementManagerClient() {
|
| + return client_bundle_->bluetooth_advertisement_manager_client();
|
| +}
|
| +
|
| BluetoothAgentManagerClient*
|
| DBusThreadManager::GetBluetoothAgentManagerClient() {
|
| return client_bundle_->bluetooth_agent_manager_client();
|
| @@ -488,6 +494,12 @@ void DBusThreadManagerSetter::SetBluetoothAdapterClient(
|
| client.Pass();
|
| }
|
|
|
| +void DBusThreadManagerSetter::SetBluetoothAdvertisementManagerClient(
|
| + scoped_ptr<BluetoothAdvertisementManagerClient> client) {
|
| + DBusThreadManager::Get()
|
| + ->client_bundle_->bluetooth_advertisement_manager_client_ = client.Pass();
|
| +}
|
| +
|
| void DBusThreadManagerSetter::SetBluetoothAgentManagerClient(
|
| scoped_ptr<BluetoothAgentManagerClient> client) {
|
| DBusThreadManager::Get()->client_bundle_->bluetooth_agent_manager_client_ =
|
|
|