chrome/browser/ui/startup/startup_browser_creator_impl.cc - Issue 12450014: Show an InfoBar when trying to start Packaged Apps from Metro mode.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: feedback 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

« no previous file with comments | « chrome/browser/ui/extensions/app_metro_infobar_delegate_win.cc ('k') | chrome/browser/ui/views/app_list/app_list_controller_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 a817e8d5c1ffcc419662994ac4be788b898934bf..117b4d145eb53efa1d5ec0dac40ec052dcb6657c 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_for_metro_restart_win.h"

#include "base/win/windows_version.h"

#endif

@@ -557,6 +558,15 @@ void StartupBrowserCreatorImpl::ProcessLaunchURLs(

return;

}

+// TODO(tapted): Move this to startup_browser_creator_win.cc after refactor.

+#if defined(OS_WIN)

+ if (base::win::GetVersion() >= base::win::VERSION_WIN8) {

+ // See if there are apps for this profile that should be launched on startup

+ // due to a switch from Metro mode.

+ apps::HandleAppLaunchForMetroRestart(profile_);

+ }

+#endif

if (process_startup && ProcessStartupURLs(urls_to_open)) {

// ProcessStartupURLs processed the urls, nothing else to do.

return;