Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 1412863004: arc-bridge: Add the ARC Bridge Service (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromeos/arc/OWNERS » ('j') | chromeos/arc/bridge/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..56688c13cab6061f6eb947871dbbab2a913ae162 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 "chromeos/arc/bridge/arc_bridge_service.h"
+#include "chromeos/arc/bridge/arc_bridge_service_factory.h"
+#endif
+
using content::ChildProcessSecurityPolicy;
using content::WebContents;
using extensions::Extension;
@@ -592,6 +597,14 @@ bool StartupBrowserCreatorImpl::ProcessStartupURLs(
restore_service->HandleStartup(apps::AppRestoreService::ShouldRestoreApps(
StartupBrowserCreator::WasRestarted()));
}
+#if defined(OS_CHROMEOS)
+ // In Chrome OS let's try to restore the ARC instance if it is available.
+ arc::ArcBridgeService* arc_bridge_service =
+ arc::ArcBridgeServiceFactory::GetForProfile(profile_);
+ if (arc_bridge_service) {
+ arc_bridge_service->HandleStartup();
+ }
+#endif
satorux1 2015/10/23 06:10:58 I'm not sure if this is the right place. Let's ask
Luis Héctor Chávez 2015/10/27 00:37:47 Ack. He expressed that this is an okay place.
if (pref.type == SessionStartupPref::LAST) {
if (profile_->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
« no previous file with comments | « no previous file | chromeos/arc/OWNERS » ('j') | chromeos/arc/bridge/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698