| Index: components/arc/arc_service_manager.cc
|
| diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
|
| index 0e18308aa106ba1c5455188d3aae6b61bb4c44fa..bfd30ea580c9ca5efefc0946db0d58ef8ca75932 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"
|
| @@ -11,6 +13,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 {
|
|
|
| @@ -22,16 +25,19 @@ ArcServiceManager* g_arc_service_manager = nullptr;
|
| } // namespace
|
|
|
| ArcServiceManager::ArcServiceManager(
|
| - scoped_ptr<ArcSettingsBridge> settings_bridge)
|
| + scoped_ptr<ArcSettingsBridge> settings_bridge,
|
| + scoped_ptr<ArcVideoBridge> video_bridge)
|
| : arc_bridge_service_(
|
| new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())),
|
| - arc_settings_bridge_(std::move(settings_bridge)) {
|
| + arc_settings_bridge_(std::move(settings_bridge)),
|
| + arc_video_bridge_(std::move(video_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();
|
| + arc_video_bridge_->StartObservingBridgeServiceChanges();
|
| }
|
|
|
| ArcServiceManager::~ArcServiceManager() {
|
|
|