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

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: tapted@: test fixes and remove a const-ref. 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') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 c0891d557899d20e4007e34a5b4a117e0cc6a8b7..42c1ad768dd5153026d6e6e1ce778f74aa088cbe 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -213,6 +213,9 @@ void OnUserManagerSystemProfileCreated(
} 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(system_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,
« no previous file with comments | « chrome/browser/profiles/profile_window.h ('k') | chrome/browser/ui/app_list/app_list_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698