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

Unified Diff: chromeos/dbus/dbus_client_bundle.cc

Issue 996013003: privetd: Expose dbus API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
Index: chromeos/dbus/dbus_client_bundle.cc
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
index 52a99e96c8c21c1b7aa67da9204f2054bb10b010..9f995f05db361eef6c75bc03e9b1fbd429dbded7 100644
--- a/chromeos/dbus/dbus_client_bundle.cc
+++ b/chromeos/dbus/dbus_client_bundle.cc
@@ -56,6 +56,7 @@
#include "chromeos/dbus/fake_nfc_tag_client.h"
#include "chromeos/dbus/fake_peer_daemon_manager_client.h"
#include "chromeos/dbus/fake_permission_broker_client.h"
+#include "chromeos/dbus/fake_privet_daemon_manager_client.h"
#include "chromeos/dbus/fake_shill_device_client.h"
#include "chromeos/dbus/fake_shill_ipconfig_client.h"
#include "chromeos/dbus/fake_shill_manager_client.h"
@@ -80,6 +81,7 @@
#include "chromeos/dbus/permission_broker_client.h"
#include "chromeos/dbus/power_manager_client.h"
#include "chromeos/dbus/power_policy_controller.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"
@@ -118,6 +120,7 @@ const struct {
{ "nfc", DBusClientBundle::NFC },
{ "peer_daemon", DBusClientBundle::PEER_DAEMON },
{ "permission_broker", DBusClientBundle::PERMISSION_BROKER },
+ { "privet_daemon", DBusClientBundle::PRIVET_DAEMON },
wtc 2015/03/17 17:31:05 Nit: list "privet_daemon" after "power_manager".
dtapuska 2015/03/18 14:28:53 Done.
{ "power_manager", DBusClientBundle::POWER_MANAGER },
{ "session_manager", DBusClientBundle::SESSION_MANAGER },
{ "sms", DBusClientBundle::SMS },
@@ -281,6 +284,11 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask)
else
permission_broker_client_.reset(new FakePermissionBrokerClient);
+ if (!IsUsingStub(PRIVET_DAEMON))
+ privet_daemon_manager_client_.reset(PrivetDaemonManagerClient::Create());
+ else
+ privet_daemon_manager_client_.reset(new FakePrivetDaemonManagerClient);
+
if (!IsUsingStub(LEADERSHIP_DAEMON)) {
leadership_daemon_manager_client_.reset(
LeadershipDaemonManagerClient::Create());

Powered by Google App Engine
This is Rietveld 408576698