| 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 490b417e70ad11c5082384f5fa05752402d3c966..08bc59e3a02b9e7958d2e0e11147f04513f0d721 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -144,6 +144,10 @@
|
| #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h"
|
| #endif
|
|
|
| +#if defined(ENABLE_ARC)
|
| +#include "components/arc/arc_bridge_service.h"
|
| +#endif
|
| +
|
| namespace chromeos {
|
|
|
| namespace {
|
| @@ -386,6 +390,15 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
|
|
|
| wake_on_wifi_manager_.reset(new WakeOnWifiManager());
|
|
|
| +#if defined(ENABLE_ARC)
|
| + arc_bridge_service_.reset(new arc::ArcBridgeService(
|
| + content::BrowserThread::GetMessageLoopProxyForThread(
|
| + content::BrowserThread::IO),
|
| + content::BrowserThread::GetMessageLoopProxyForThread(
|
| + content::BrowserThread::FILE)));
|
| + arc_bridge_service_->DetectAvailability();
|
| +#endif
|
| +
|
| ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
|
| }
|
|
|
| @@ -699,6 +712,10 @@ void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
|
| void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
| BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
|
|
|
| +#if defined(ENABLE_ARC)
|
| + arc_bridge_service_->Shutdown();
|
| +#endif
|
| +
|
| // Destroy the application name notifier for Kiosk mode.
|
| KioskModeIdleAppNameNotification::Shutdown();
|
|
|
|
|