| Index: chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
|
| index 29b78e336f60715565dc65361289313f4f00f6bf..b75b3b0a43f1add14cf493726475c0077c949e31 100644
|
| --- a/chromeos/dbus/dbus_thread_manager.cc
|
| +++ b/chromeos/dbus/dbus_thread_manager.cc
|
| @@ -29,6 +29,7 @@
|
| #include "chromeos/dbus/gsm_sms_client.h"
|
| #include "chromeos/dbus/image_burner_client.h"
|
| #include "chromeos/dbus/introspectable_client.h"
|
| +#include "chromeos/dbus/leadership_daemon_manager_client.h"
|
| #include "chromeos/dbus/lorgnette_manager_client.h"
|
| #include "chromeos/dbus/modem_messaging_client.h"
|
| #include "chromeos/dbus/nfc_adapter_client.h"
|
| @@ -185,6 +186,12 @@ DebugDaemonClient* DBusThreadManager::GetDebugDaemonClient() {
|
| EasyUnlockClient* DBusThreadManager::GetEasyUnlockClient() {
|
| return client_bundle_->easy_unlock_client();
|
| }
|
| +
|
| +LeadershipDaemonManagerClient*
|
| +DBusThreadManager::GetLeadershipDaemonManagerClient() {
|
| + return client_bundle_->leadership_daemon_manager_client();
|
| +}
|
| +
|
| LorgnetteManagerClient*
|
| DBusThreadManager::GetLorgnetteManagerClient() {
|
| return client_bundle_->lorgnette_manager_client();
|
| @@ -308,6 +315,7 @@ void DBusThreadManager::InitializeClients() {
|
| GetGsmSMSClient()->Init(GetSystemBus());
|
| GetImageBurnerClient()->Init(GetSystemBus());
|
| GetIntrospectableClient()->Init(GetSystemBus());
|
| + GetLeadershipDaemonManagerClient()->Init(GetSystemBus());
|
| GetLorgnetteManagerClient()->Init(GetSystemBus());
|
| GetModemMessagingClient()->Init(GetSystemBus());
|
| GetPermissionBrokerClient()->Init(GetSystemBus());
|
| @@ -536,6 +544,12 @@ void DBusThreadManagerSetter::SetEasyUnlockClient(
|
| DBusThreadManager::Get()->client_bundle_->easy_unlock_client_ = client.Pass();
|
| }
|
|
|
| +void DBusThreadManagerSetter::SetLeadershipDaemonManagerClient(
|
| + scoped_ptr<LeadershipDaemonManagerClient> client) {
|
| + DBusThreadManager::Get()->client_bundle_->leadership_daemon_manager_client_ =
|
| + client.Pass();
|
| +}
|
| +
|
| void DBusThreadManagerSetter::SetLorgnetteManagerClient(
|
| scoped_ptr<LorgnetteManagerClient> client) {
|
| DBusThreadManager::Get()->client_bundle_->lorgnette_manager_client_ =
|
|
|