Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: chromeos/dbus/dbus_client_bundle.cc

Issue 887083002: Add DBus Bindings for leaderd (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ctl-X Ctl-S saves your work dave... Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/dbus_client_bundle.h ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/dbus_client_bundle.cc
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
index 313e52b34ce4ee3a21bfa0869ebbe35d2814b912..97b2112785ad713e21ce779ec7855b01e91f873c 100644
--- a/chromeos/dbus/dbus_client_bundle.cc
+++ b/chromeos/dbus/dbus_client_bundle.cc
@@ -44,6 +44,7 @@
#include "chromeos/dbus/fake_gsm_sms_client.h"
#include "chromeos/dbus/fake_image_burner_client.h"
#include "chromeos/dbus/fake_introspectable_client.h"
+#include "chromeos/dbus/fake_leadership_daemon_manager_client.h"
#include "chromeos/dbus/fake_lorgnette_manager_client.h"
#include "chromeos/dbus/fake_modem_messaging_client.h"
#include "chromeos/dbus/fake_nfc_adapter_client.h"
@@ -65,6 +66,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"
@@ -103,6 +105,7 @@ const struct {
{ "cryptohome", DBusClientBundle::CRYPTOHOME },
{ "debug_daemon", DBusClientBundle::DEBUG_DAEMON },
{ "easy_unlock", DBusClientBundle::EASY_UNLOCK },
+ { "leadership_daemon", DBusClientBundle::LEADERSHIP_DAEMON },
{ "lorgnette_manager", DBusClientBundle::LORGNETTE_MANAGER },
{ "shill", DBusClientBundle::SHILL },
{ "gsm_sms", DBusClientBundle::GSM_SMS },
@@ -277,6 +280,14 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask)
else
privet_daemon_client_.reset(new FakePrivetDaemonClient);
+ if (!IsUsingStub(LEADERSHIP_DAEMON)) {
+ leadership_daemon_manager_client_.reset(
+ LeadershipDaemonManagerClient::Create());
+ } else {
+ leadership_daemon_manager_client_.reset(
+ new FakeLeadershipDaemonManagerClient);
+ }
+
power_manager_client_.reset(PowerManagerClient::Create(
IsUsingStub(POWER_MANAGER) ? STUB_DBUS_CLIENT_IMPLEMENTATION
: REAL_DBUS_CLIENT_IMPLEMENTATION));
« no previous file with comments | « chromeos/dbus/dbus_client_bundle.h ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698