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

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

Issue 12450014: Show an InfoBar when trying to start Packaged Apps from Metro mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: handle flakiness Created 7 years, 9 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
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 2924bcf11587b732b7f866d9ff7df03ed0c45bb2..2079661a53d2fce26145fefd43182fe31b0b5a60 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -101,6 +101,7 @@
#endif
#if defined(OS_WIN)
+#include "apps/app_launch_on_restart_service_win.h"
#include "base/win/windows_version.h"
#endif
@@ -630,6 +631,11 @@ bool StartupBrowserCreatorImpl::ProcessStartupURLs(
#endif
service->HandleStartup(should_restore_apps);
}
+
+#if defined(OS_WIN)
+ apps::AppLaunchOnRestartServiceWin::HandleStartupForProfile(profile_);
tapted 2013/03/19 02:49:05 This function is only called if process_startup is
+#endif
+
if (pref.type == SessionStartupPref::LAST) {
if (profile_->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
!command_line_.HasSwitch(switches::kRestoreLastSession)) {

Powered by Google App Engine
This is Rietveld 408576698