Chromium Code Reviews| 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 33f04e40579d200af13601afef5a76be035a70e6..11305a506b1005fb308255f2f95d30b6dc60cbd4 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -113,6 +113,7 @@ |
| #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_service.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" |
| @@ -122,6 +123,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_service.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/notification_service.h" |
| #include "content/public/common/content_switches.h" |
| @@ -392,7 +394,8 @@ 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(content::CreateArcVideoService()))); |
|
Pawel Osciak
2015/12/28 08:58:03
Could CreateArcVideoService return a scoper instea
kcwu
2015/12/28 09:31:04
Done.
|
| arc_service_manager_->arc_bridge_service()->DetectAvailability(); |
| chromeos::ResourceReporter::GetInstance()->StartMonitoring(); |