Chromium Code Reviews| 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..03a3c5d4729e4db15bacfaa9c561da69ff6945df 100644 |
| --- a/components/arc/arc_service_manager.cc |
| +++ b/components/arc/arc_service_manager.cc |
| @@ -11,6 +11,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_service.h" |
| namespace arc { |
| @@ -22,16 +23,19 @@ ArcServiceManager* g_arc_service_manager = nullptr; |
| } // namespace |
| ArcServiceManager::ArcServiceManager( |
| - scoped_ptr<ArcSettingsBridge> settings_bridge) |
| + scoped_ptr<ArcSettingsBridge> settings_bridge, |
| + scoped_ptr<ArcVideoService> arc_video_service) |
| : arc_bridge_service_( |
| new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())), |
| - arc_settings_bridge_(std::move(settings_bridge)) { |
| + arc_settings_bridge_(std::move(settings_bridge)), |
| + arc_video_service_(std::move(arc_video_service)) { |
|
dcheng
2015/12/29 00:43:23
#include <utility> please.
kcwu
2015/12/29 03:36:32
Done.
|
| 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_service_->Initialize(); |
| } |
| ArcServiceManager::~ArcServiceManager() { |