Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
index dbb7b660e222d6ac6f5a0a966bb5938b37979029..2ba78b3121b95cfc796d31840f2823199679c0e0 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -116,6 +116,8 @@ |
#include "components/arc/arc_bridge_service.h" |
#include "components/arc/arc_service_manager.h" |
#include "components/arc/settings/arc_settings_bridge.h" |
+#include "components/arc/video/arc_video_bridge.h" |
+#include "components/arc/video/video_host_delegate.h" |
#include "components/browser_sync/common/browser_sync_switches.h" |
#include "components/device_event_log/device_event_log.h" |
#include "components/metrics/metrics_service.h" |
@@ -125,6 +127,7 @@ |
#include "components/user_manager/user.h" |
#include "components/user_manager/user_manager.h" |
#include "components/wallpaper/wallpaper_manager_base.h" |
+#include "content/public/browser/arc_video_host_delegate.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/common/content_switches.h" |
@@ -395,7 +398,9 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { |
wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
arc_service_manager_.reset(new arc::ArcServiceManager( |
- make_scoped_ptr(new arc::ArcSettingsBridgeImpl()))); |
+ make_scoped_ptr(new arc::ArcSettingsBridgeImpl()), |
+ make_scoped_ptr( |
+ new arc::ArcVideoBridge(content::CreateArcVideoHostDelegate())))); |
arc_service_manager_->arc_bridge_service()->DetectAvailability(); |
chromeos::ResourceReporter::GetInstance()->StartMonitoring(); |