| Index: components/arc/arc_service_manager.cc
|
| diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
|
| index 38553782dc0e3c9c2ac1f09f5256fcb31480e9ca..d72dfd5aed19ba9cff3f09380f201f91e9548100 100644
|
| --- a/components/arc/arc_service_manager.cc
|
| +++ b/components/arc/arc_service_manager.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "components/arc/arc_service_manager.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/sequenced_task_runner.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "components/arc/arc_bridge_bootstrap.h"
|
| @@ -12,6 +14,7 @@
|
| #include "components/arc/input/arc_input_bridge.h"
|
| #include "components/arc/power/arc_power_bridge.h"
|
| #include "components/arc/settings/arc_settings_bridge.h"
|
| +#include "components/arc/video/arc_video_bridge.h"
|
|
|
| namespace arc {
|
|
|
| @@ -24,18 +27,21 @@ ArcServiceManager* g_arc_service_manager = nullptr;
|
|
|
| ArcServiceManager::ArcServiceManager(
|
| scoped_ptr<ArcAuthService> auth_service,
|
| - scoped_ptr<ArcSettingsBridge> settings_bridge)
|
| + scoped_ptr<ArcSettingsBridge> settings_bridge,
|
| + scoped_ptr<ArcVideoBridge> video_bridge)
|
| : arc_bridge_service_(
|
| new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())),
|
| arc_auth_service_(std::move(auth_service)),
|
| arc_input_bridge_(ArcInputBridge::Create(arc_bridge_service_.get())),
|
| arc_settings_bridge_(std::move(settings_bridge)),
|
| - arc_power_bridge_(new ArcPowerBridge(arc_bridge_service_.get())) {
|
| + arc_power_bridge_(new ArcPowerBridge(arc_bridge_service_.get())),
|
| + arc_video_bridge_(std::move(video_bridge)) {
|
| DCHECK(!g_arc_service_manager);
|
| g_arc_service_manager = this;
|
|
|
| arc_settings_bridge_->StartObservingBridgeServiceChanges();
|
| arc_auth_service_->StartObservingBridgeServiceChanges();
|
| + arc_video_bridge_->StartObservingBridgeServiceChanges();
|
| }
|
|
|
| ArcServiceManager::~ArcServiceManager() {
|
|
|