diff options
| author | varkha <varkha@chromium.org> | 2015-03-05 12:48:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-05 20:49:08 +0000 |
| commit | 2aba422641731a4e8a4186da5a0866e5313b4359 (patch) | |
| tree | 8f886e67c6efccdbd946adff5f90c8607052f37f /chromeos/dbus/dbus_client_bundle.cc | |
| parent | 482ee8fb6ab301cc0582e2f7af93a65011741c12 (diff) | |
| download | chromium_src-2aba422641731a4e8a4186da5a0866e5313b4359.zip chromium_src-2aba422641731a4e8a4186da5a0866e5313b4359.tar.gz chromium_src-2aba422641731a4e8a4186da5a0866e5313b4359.tar.bz2 | |
Adds metronome time sync dbus client
BUG=395878
TEST = run with "--dbus-stub --test-metronome-timer" in command line to test with a timer-based implementation.
Review URL: https://codereview.chromium.org/935933002
Cr-Commit-Position: refs/heads/master@{#319322}
Diffstat (limited to 'chromeos/dbus/dbus_client_bundle.cc')
| -rw-r--r-- | chromeos/dbus/dbus_client_bundle.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc index 77a7010..d762b7e 100644 --- a/chromeos/dbus/dbus_client_bundle.cc +++ b/chromeos/dbus/dbus_client_bundle.cc @@ -67,6 +67,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" @@ -105,6 +106,7 @@ const struct { { "easy_unlock", DBusClientBundle::EASY_UNLOCK }, { "leadership_daemon", DBusClientBundle::LEADERSHIP_DAEMON }, { "lorgnette_manager", DBusClientBundle::LORGNETTE_MANAGER }, + { "metronome", DBusClientBundle::METRONOME }, { "shill", DBusClientBundle::SHILL }, { "gsm_sms", DBusClientBundle::GSM_SMS }, { "image_burner", DBusClientBundle::IMAGE_BURNER }, @@ -201,6 +203,10 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask) else lorgnette_manager_client_.reset(new FakeLorgnetteManagerClient); + metronome_client_.reset(MetronomeClient::Create( + IsUsingStub(METRONOME) ? STUB_DBUS_CLIENT_IMPLEMENTATION + : REAL_DBUS_CLIENT_IMPLEMENTATION)); + if (!IsUsingStub(SHILL)) { shill_manager_client_.reset(ShillManagerClient::Create()); shill_device_client_.reset(ShillDeviceClient::Create()); |