chrome/browser/ui/startup/startup_browser_creator.cc - Issue 856733004: Loading the Launcher with a Locked Profile launched UserManager.

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

Issue 856733004: Loading the Launcher with a Locked Profile launched UserManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move ProfileLocked check. Add unit test. Created 5 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

« chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc ('K') | « chrome/browser/ui/ash/app_list/app_list_service_ash.cc ('k') | chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc » ('j') | chrome/browser/ui/webui/signin/user_manager_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc

index 07f7bb774167448012a6fe4bd1165d801b1931a4..700e8c5f1676427ff70b9ab5236d488c582f3ed1 100644

--- a/chrome/browser/ui/startup/startup_browser_creator.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator.cc

@@ -702,9 +702,12 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(

last_used_profile->GetOffTheRecordProfile()) > 0;

if (signin_required ||

(last_used_profile->IsGuestSession() && !has_guest_browsers)) {

- UserManager::Show(base::FilePath(),

- profiles::USER_MANAGER_NO_TUTORIAL,

- profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);

+ profiles::UserManagerProfileSelected action =

+ command_line.HasSwitch(switches::kShowAppList) ?

+ profiles::USER_MANAGER_SELECT_PROFILE_APP_LAUNCHER :

+ profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION;

+ UserManager::Show(

+ base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL, action);

return true;

}