| Index: chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
|
| index ecb6af2e86b0b612dd487bd7641e62b53997bd20..4dd02862fb7e17ad1d182ed793f54ac027842000 100644
|
| --- a/chromeos/dbus/dbus_thread_manager.cc
|
| +++ b/chromeos/dbus/dbus_thread_manager.cc
|
| @@ -15,6 +15,7 @@
|
| #include "chromeos/dbus/cras_audio_client.h"
|
| #include "chromeos/dbus/cros_disks_client.h"
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| +#include "chromeos/dbus/cups_client.h"
|
| #include "chromeos/dbus/dbus_client.h"
|
| #include "chromeos/dbus/debug_daemon_client.h"
|
| #include "chromeos/dbus/easy_unlock_client.h"
|
| @@ -113,6 +114,10 @@ CryptohomeClient* DBusThreadManager::GetCryptohomeClient() {
|
| return client_bundle_->cryptohome_client();
|
| }
|
|
|
| +CupsClient* DBusThreadManager::GetCupsClient() {
|
| + return client_bundle_->cups_client();
|
| +}
|
| +
|
| DebugDaemonClient* DBusThreadManager::GetDebugDaemonClient() {
|
| return client_bundle_->debug_daemon_client();
|
| }
|
| @@ -197,6 +202,7 @@ void DBusThreadManager::InitializeClients() {
|
| GetCrasAudioClient()->Init(GetSystemBus());
|
| GetCrosDisksClient()->Init(GetSystemBus());
|
| GetCryptohomeClient()->Init(GetSystemBus());
|
| + GetCupsClient()->Init(GetSystemBus());
|
| GetDebugDaemonClient()->Init(GetSystemBus());
|
| GetEasyUnlockClient()->Init(GetSystemBus());
|
| GetGsmSMSClient()->Init(GetSystemBus());
|
| @@ -345,6 +351,11 @@ void DBusThreadManagerSetter::SetCryptohomeClient(
|
| std::move(client);
|
| }
|
|
|
| +void DBusThreadManagerSetter::SetCupsClient(
|
| + std::unique_ptr<CupsClient> client) {
|
| + DBusThreadManager::Get()->client_bundle_->cups_client_ = std::move(client);
|
| +}
|
| +
|
| void DBusThreadManagerSetter::SetDebugDaemonClient(
|
| std::unique_ptr<DebugDaemonClient> client) {
|
| DBusThreadManager::Get()->client_bundle_->debug_daemon_client_ =
|
|
|