chrome/browser/chrome_browser_main.cc - Issue 11968034: Enable profile switching for standalone App Launcher via the Settings App.

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/chrome_browser_main.cc

Issue 11968034: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: git://nomatter.syd/chromium/src.git@master

Patch Set: Created 7 years, 11 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/app/generated_resources.grd ('k') | chrome/browser/extensions/extension_install_ui_default.cc » ('j') | chrome/browser/profiles/profile_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index d9e443d307de45fc135e6b5462e2540debe49f3c..6345f9c272c954749dbd975ef1f1f7c80d102d3b 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -334,8 +334,13 @@ Profile* CreateProfile(const content::MainFunctionParams& parameters,

profile = g_browser_process->profile_manager()->GetDefaultProfile(

user_data_dir);

#else

- profile = g_browser_process->profile_manager()->GetLastUsedProfile(

- user_data_dir);

+ if (parsed_command_line.HasSwitch(switches::kShowAppList)) {

+ profile = g_browser_process->profile_manager()->GetAppListProfile(

+ user_data_dir);

+ } else {

+ profile = g_browser_process->profile_manager()->GetLastUsedProfile(

+ user_data_dir);

+ }

#endif

if (profile)

return profile;