| Index: chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
|
| index b75b3b0a43f1add14cf493726475c0077c949e31..ab11d44a4fb7a27f2b6d94a61e0949558f86dbd0 100644
|
| --- a/chromeos/dbus/dbus_thread_manager.cc
|
| +++ b/chromeos/dbus/dbus_thread_manager.cc
|
| @@ -31,6 +31,7 @@
|
| #include "chromeos/dbus/introspectable_client.h"
|
| #include "chromeos/dbus/leadership_daemon_manager_client.h"
|
| #include "chromeos/dbus/lorgnette_manager_client.h"
|
| +#include "chromeos/dbus/metronome_client.h"
|
| #include "chromeos/dbus/modem_messaging_client.h"
|
| #include "chromeos/dbus/nfc_adapter_client.h"
|
| #include "chromeos/dbus/nfc_device_client.h"
|
| @@ -197,6 +198,10 @@ DBusThreadManager::GetLorgnetteManagerClient() {
|
| return client_bundle_->lorgnette_manager_client();
|
| }
|
|
|
| +MetronomeClient* DBusThreadManager::GetMetronomeClient() {
|
| + return client_bundle_->metronome_client();
|
| +}
|
| +
|
| ShillDeviceClient*
|
| DBusThreadManager::GetShillDeviceClient() {
|
| return client_bundle_->shill_device_client();
|
| @@ -317,6 +322,7 @@ void DBusThreadManager::InitializeClients() {
|
| GetIntrospectableClient()->Init(GetSystemBus());
|
| GetLeadershipDaemonManagerClient()->Init(GetSystemBus());
|
| GetLorgnetteManagerClient()->Init(GetSystemBus());
|
| + GetMetronomeClient()->Init(GetSystemBus());
|
| GetModemMessagingClient()->Init(GetSystemBus());
|
| GetPermissionBrokerClient()->Init(GetSystemBus());
|
| GetPeerDaemonManagerClient()->Init(GetSystemBus());
|
| @@ -556,6 +562,11 @@ void DBusThreadManagerSetter::SetLorgnetteManagerClient(
|
| client.Pass();
|
| }
|
|
|
| +void DBusThreadManagerSetter::SetMetronomeClient(
|
| + scoped_ptr<MetronomeClient> client) {
|
| + DBusThreadManager::Get()->client_bundle_->metronome_client_ = client.Pass();
|
| +}
|
| +
|
| void DBusThreadManagerSetter::SetShillDeviceClient(
|
| scoped_ptr<ShillDeviceClient> client) {
|
| DBusThreadManager::Get()->client_bundle_->shill_device_client_ =
|
|
|