Chromium Code Reviews| Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc |
| diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc |
| index 5467148ec7eba5148867429e29c3121d5b439a63..858d6bda4d19d348fc25a2788e6e1e9d6415f863 100644 |
| --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc |
| +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc |
| @@ -113,6 +113,11 @@ |
| #include "components/rlz/rlz_tracker.h" |
| #endif |
| +#if defined(OS_CHROMEOS) |
| +#include "components/arc/arc_bridge_service.h" |
| +#include "components/arc/arc_prefs.h" |
| +#endif |
| + |
| using content::ChildProcessSecurityPolicy; |
| using content::WebContents; |
| using extensions::Extension; |
| @@ -593,6 +598,11 @@ bool StartupBrowserCreatorImpl::ProcessStartupURLs( |
| StartupBrowserCreator::WasRestarted())); |
| } |
| +#if defined(OS_CHROMEOS) |
| + arc::ArcBridgeService::Get()->SetEnabled( |
|
oshima
2015/11/11 18:15:10
can't you do this in observer?
Luis Héctor Chávez
2015/11/11 21:11:51
Done.
|
| + arc::ArcPrefs::GetEnabled(profile_->GetPrefs())); |
| +#endif |
| + |
| if (pref.type == SessionStartupPref::LAST) { |
| if (profile_->GetLastSessionExitType() == Profile::EXIT_CRASHED && |
| !command_line_.HasSwitch(switches::kRestoreLastSession)) { |