Chromium Code Reviews| Index: chromeos/dbus/dbus_thread_manager.cc |
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc |
| index 8e705f46beb8c31d90647d8c243971f88918d70f..207cc1adebdd018e89451a1185e76a4930601219 100644 |
| --- a/chromeos/dbus/dbus_thread_manager.cc |
| +++ b/chromeos/dbus/dbus_thread_manager.cc |
| @@ -41,6 +41,7 @@ |
| #include "chromeos/dbus/peer_daemon_manager_client.h" |
| #include "chromeos/dbus/permission_broker_client.h" |
| #include "chromeos/dbus/power_manager_client.h" |
| +#include "chromeos/dbus/privet_daemon_manager_client.h" |
| #include "chromeos/dbus/session_manager_client.h" |
| #include "chromeos/dbus/shill_device_client.h" |
| #include "chromeos/dbus/shill_ipconfig_client.h" |
| @@ -276,6 +277,10 @@ PermissionBrokerClient* DBusThreadManager::GetPermissionBrokerClient() { |
| return client_bundle_->permission_broker_client(); |
| } |
| +PrivetDaemonManagerClient* DBusThreadManager::GetPrivetDaemonManagerClient() { |
|
wtc
2015/03/17 17:31:05
Nit: list "Private" after "Power".
This also appl
dtapuska
2015/03/18 14:28:53
I believe I was using a different alphabet the day
|
| + return client_bundle_->privet_daemon_manager_client(); |
| +} |
| + |
| PowerManagerClient* DBusThreadManager::GetPowerManagerClient() { |
| return client_bundle_->power_manager_client(); |
| } |
| @@ -323,6 +328,7 @@ void DBusThreadManager::InitializeClients() { |
| GetModemMessagingClient()->Init(GetSystemBus()); |
| GetPermissionBrokerClient()->Init(GetSystemBus()); |
| GetPeerDaemonManagerClient()->Init(GetSystemBus()); |
| + GetPrivetDaemonManagerClient()->Init(GetSystemBus()); |
| GetPowerManagerClient()->Init(GetSystemBus()); |
| GetSessionManagerClient()->Init(GetSystemBus()); |
| GetShillDeviceClient()->Init(GetSystemBus()); |
| @@ -653,6 +659,12 @@ void DBusThreadManagerSetter::SetPermissionBrokerClient( |
| client.Pass(); |
| } |
| +void DBusThreadManagerSetter::SetPrivetDaemonManagerClient( |
| + scoped_ptr<PrivetDaemonManagerClient> client) { |
| + DBusThreadManager::Get()->client_bundle_->privet_daemon_manager_client_ = |
| + client.Pass(); |
| +} |
| + |
| void DBusThreadManagerSetter::SetPowerManagerClient( |
| scoped_ptr<PowerManagerClient> client) { |
| DBusThreadManager::Get()->client_bundle_->power_manager_client_ = |