chrome/browser/profiles/profile_window.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/profiles/profile_window.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: Use a testing profile manager 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

« no previous file with comments | « chrome/browser/profiles/profile_window.h ('k') | chrome/browser/ui/app_list/app_list_service.h » ('j') | chrome/browser/ui/app_list/app_list_service_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_window.cc

diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc

index 320388f389c31804652867d0be3d406c68773c11..1ed78e3ef820da526bc32238e342cf2357d50f50 100644

--- a/chrome/browser/profiles/profile_window.cc

+++ b/chrome/browser/profiles/profile_window.cc

@@ -213,6 +213,9 @@ void OnUserManagerGuestProfileCreated(

} else if (profile_open_action ==

profiles::USER_MANAGER_SELECT_PROFILE_CHROME_MEMORY) {

page += profiles::kUserManagerSelectProfileChromeMemory;

+ } else if (profile_open_action ==

+ profiles::USER_MANAGER_SELECT_PROFILE_APP_LAUNCHER) {

+ page += profiles::kUserManagerSelectProfileAppLauncher;

}

callback.Run(guest_profile, page);

}

@@ -236,6 +239,7 @@ const char kUserManagerSelectProfileTaskManager[] = "#task-manager";

const char kUserManagerSelectProfileAboutChrome[] = "#about-chrome";

const char kUserManagerSelectProfileChromeSettings[] = "#chrome-settings";

const char kUserManagerSelectProfileChromeMemory[] = "#chrome-memory";

+const char kUserManagerSelectProfileAppLauncher[] = "#app-launcher";

void FindOrCreateNewWindowForProfile(

Profile* profile,