summaryrefslogtreecommitdiffstats
path: root/components/arc/arc_service_manager.cc
diff options
context:
space:
mode:
authorejcaruso <ejcaruso@chromium.org>2015-12-22 13:29:19 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-22 21:31:05 +0000
commit86467505c045b22b9e778e6202592d443ed42dba (patch)
treefd9ffef44346336057a9d3c4bea2f8b237927b37 /components/arc/arc_service_manager.cc
parent61527225a5e0afadb75d3f85e3ce5624f228ff5c (diff)
downloadchromium_src-86467505c045b22b9e778e6202592d443ed42dba.zip
chromium_src-86467505c045b22b9e778e6202592d443ed42dba.tar.gz
chromium_src-86467505c045b22b9e778e6202592d443ed42dba.tar.bz2
power, arc: add ArcPowerBridge
Using new functionality in PowerPolicyController, we can take Chrome wake locks instead of powerd wake locks, so we don't need to route requests through PowerManagerClient or use dbus. ArcPowerBridge keeps track of the Chrome wake locks that ARC has taken, and releases them when the instance stops to prevent wake lock leaks. BUG=b:24671115 TEST=run apps that use wake locks, check logs for policy changes Review URL: https://codereview.chromium.org/1488343002 Cr-Commit-Position: refs/heads/master@{#366657}
Diffstat (limited to 'components/arc/arc_service_manager.cc')
-rw-r--r--components/arc/arc_service_manager.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
index 68f01cb1..0e18308 100644
--- a/components/arc/arc_service_manager.cc
+++ b/components/arc/arc_service_manager.cc
@@ -9,6 +9,7 @@
#include "components/arc/arc_bridge_bootstrap.h"
#include "components/arc/arc_bridge_service_impl.h"
#include "components/arc/input/arc_input_bridge.h"
+#include "components/arc/power/arc_power_bridge.h"
#include "components/arc/settings/arc_settings_bridge.h"
namespace arc {
@@ -27,6 +28,7 @@ ArcServiceManager::ArcServiceManager(
arc_settings_bridge_(std::move(settings_bridge)) {
DCHECK(!g_arc_service_manager);
arc_input_bridge_ = ArcInputBridge::Create(arc_bridge_service_.get());
+ arc_power_bridge_.reset(new ArcPowerBridge(arc_bridge_service_.get()));
g_arc_service_manager = this;
arc_settings_bridge_->StartObservingBridgeServiceChanges();