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

Unified Diff: chromeos/dbus/dbus_client_bundle.cc

Issue 980973003: apmanager: Add dbus implementation to chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased on conflicting change 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
Index: chromeos/dbus/dbus_client_bundle.cc
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
index d762b7ec22917269512fc67f9028e8ed88b7a8a2..52a99e96c8c21c1b7aa67da9204f2054bb10b010 100644
--- a/chromeos/dbus/dbus_client_bundle.cc
+++ b/chromeos/dbus/dbus_client_bundle.cc
@@ -10,6 +10,7 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "chromeos/chromeos_switches.h"
+#include "chromeos/dbus/ap_manager_client.h"
#include "chromeos/dbus/bluetooth_adapter_client.h"
#include "chromeos/dbus/bluetooth_agent_manager_client.h"
#include "chromeos/dbus/bluetooth_device_client.h"
@@ -26,6 +27,7 @@
#include "chromeos/dbus/cryptohome_client.h"
#include "chromeos/dbus/debug_daemon_client.h"
#include "chromeos/dbus/easy_unlock_client.h"
+#include "chromeos/dbus/fake_ap_manager_client.h"
#include "chromeos/dbus/fake_bluetooth_adapter_client.h"
#include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
#include "chromeos/dbus/fake_bluetooth_device_client.h"
@@ -98,6 +100,7 @@ const struct {
const char* param_name;
DBusClientBundle::DBusClientType client_type;
} client_type_map[] = {
+ { "ap", DBusClientBundle::AP_MANAGER },
{ "bluetooth", DBusClientBundle::BLUETOOTH },
{ "cras", DBusClientBundle::CRAS },
{ "cros_disks", DBusClientBundle::CROS_DISKS },
@@ -286,6 +289,11 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask)
new FakeLeadershipDaemonManagerClient);
}
+ if (!IsUsingStub(AP_MANAGER))
+ ap_manager_client_.reset(ApManagerClient::Create());
+ else
+ ap_manager_client_.reset(new FakeApManagerClient);
+
power_manager_client_.reset(PowerManagerClient::Create(
IsUsingStub(POWER_MANAGER) ? STUB_DBUS_CLIENT_IMPLEMENTATION
: REAL_DBUS_CLIENT_IMPLEMENTATION));

Powered by Google App Engine
This is Rietveld 408576698