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..cd33d4775c5311abe818833f0236f2c931d97fbc 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,13 @@ bool StartupBrowserCreatorImpl::ProcessStartupURLs( |
StartupBrowserCreator::WasRestarted())); |
} |
+#if defined(OS_CHROMEOS) |
+ // In Chrome OS let's try to restore the ARC instance if it is available. |
+ arc::ArcBridgeService::Get()->SetEnabled( |
sky
2015/11/10 18:47:11
Why are you doing this here rather than during bro
Luis Héctor Chávez
2015/11/10 21:03:12
Are profile preferences available there? I had tro
sky
2015/11/10 21:39:16
You may be right. But that begs another question.
Luis Héctor Chávez
2015/11/10 21:59:47
This feature will be opt-in, so we need a pref to
|
+ arc::ArcPrefs::GetEnabled(profile_->GetPrefs())); |
+ arc::ArcBridgeService::Get()->HandleStartup(); |
oshima
2015/11/10 22:09:03
how about doing this in ShellObserver::OnLoginStat
Luis Héctor Chávez
2015/11/11 17:59:35
Done.
|
+#endif |
+ |
if (pref.type == SessionStartupPref::LAST) { |
if (profile_->GetLastSessionExitType() == Profile::EXIT_CRASHED && |
!command_line_.HasSwitch(switches::kRestoreLastSession)) { |