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 7f57fa40c20c8a2f2a6488dfaad09c78114a3fc0..62cb2adeba8211225c16a2177bca128a641e34f3 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -108,6 +108,7 @@ |
| #include "chromeos/network/portal_detector/network_portal_detector_stub.h" |
| #include "chromeos/system/statistics_provider.h" |
| #include "chromeos/tpm/tpm_token_loader.h" |
| +#include "components/arc/arc_bridge_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" |
| @@ -386,6 +387,13 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { |
| wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
| + arc_bridge_service_.reset(new arc::ArcBridgeService( |
| + content::BrowserThread::GetMessageLoopProxyForThread( |
| + content::BrowserThread::IO), |
| + content::BrowserThread::GetMessageLoopProxyForThread( |
| + content::BrowserThread::FILE))); |
| + arc_bridge_service_->DetectAvailability(); |
| + |
| ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| } |
| @@ -697,6 +705,9 @@ void ChromeBrowserMainPartsChromeos::PostBrowserStart() { |
| void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); |
| + // Stop the currently running ARC instance, if any. |
|
jochen (gone - plz use gerrit)
2015/11/12 23:40:58
that comment doesn't add value
Luis Héctor Chávez
2015/11/13 00:29:29
Done.
|
| + arc_bridge_service_->Shutdown(); |
| + |
| // Destroy the application name notifier for Kiosk mode. |
| KioskModeIdleAppNameNotification::Shutdown(); |