| Index: chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
|
| index 3e88a50057f2a719b37955d1284600cf0a7dec61..e979c6c086d167e54ff7971ee5bb84caf5db46d2 100644
|
| --- a/chromeos/dbus/dbus_thread_manager.cc
|
| +++ b/chromeos/dbus/dbus_thread_manager.cc
|
| @@ -17,6 +17,7 @@
|
| #include "chromeos/dbus/bluetooth_gatt_service_client.h"
|
| #include "chromeos/dbus/bluetooth_input_client.h"
|
| #include "chromeos/dbus/bluetooth_profile_manager_client.h"
|
| +#include "chromeos/dbus/console_service_client.h"
|
| #include "chromeos/dbus/cras_audio_client.h"
|
| #include "chromeos/dbus/cros_disks_client.h"
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| @@ -161,6 +162,10 @@ CrasAudioClient* DBusThreadManager::GetCrasAudioClient() {
|
| return client_bundle_->cras_audio_client();
|
| }
|
|
|
| +ConsoleServiceClient* DBusThreadManager::GetConsoleServiceClient() {
|
| + return client_bundle_->console_service_client();
|
| +}
|
| +
|
| CrosDisksClient* DBusThreadManager::GetCrosDisksClient() {
|
| return client_bundle_->cros_disks_client();
|
| }
|
| @@ -280,6 +285,7 @@ void DBusThreadManager::InitializeClients() {
|
| GetBluetoothGattServiceClient()->Init(GetSystemBus());
|
| GetBluetoothInputClient()->Init(GetSystemBus());
|
| GetBluetoothProfileManagerClient()->Init(GetSystemBus());
|
| + GetConsoleServiceClient()->Init(GetSystemBus());
|
| GetCrasAudioClient()->Init(GetSystemBus());
|
| GetCrosDisksClient()->Init(GetSystemBus());
|
| GetCryptohomeClient()->Init(GetSystemBus());
|
| @@ -485,6 +491,11 @@ void DBusThreadManagerSetter::SetCrasAudioClient(
|
| DBusThreadManager::Get()->client_bundle_->cras_audio_client_ = client.Pass();
|
| }
|
|
|
| +void DBusThreadManagerSetter::SetConsoleServiceClient(
|
| + scoped_ptr<ConsoleServiceClient> client) {
|
| + DBusThreadManager::Get()->client_bundle_->console_service_client_ =
|
| + client.Pass();
|
| +}
|
| void DBusThreadManagerSetter::SetCrosDisksClient(
|
| scoped_ptr<CrosDisksClient> client) {
|
| DBusThreadManager::Get()->client_bundle_->cros_disks_client_ = client.Pass();
|
|
|