| Index: chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
|
| index a00a6f68a1d518d05ee05d4773d2e667516d428e..c4741e57aee28da1684f1cd5eaf0d3f845378a75 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"
|
| @@ -280,6 +281,10 @@ PowerManagerClient* DBusThreadManager::GetPowerManagerClient() {
|
| return client_bundle_->power_manager_client();
|
| }
|
|
|
| +PrivetDaemonManagerClient* DBusThreadManager::GetPrivetDaemonManagerClient() {
|
| + return client_bundle_->privet_daemon_manager_client();
|
| +}
|
| +
|
| SessionManagerClient* DBusThreadManager::GetSessionManagerClient() {
|
| return client_bundle_->session_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());
|
| @@ -659,6 +665,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_ =
|
|
|