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

Unified Diff: chrome/browser/profiles/profile_window.cc

Issue 631163004: Mac - show user manager before opening browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mark's post-test comments Created 6 years, 2 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
Index: chrome/browser/profiles/profile_window.cc
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc
index ea5bb928b2cb09a639d1394052aac1bb7b18a5d4..a9353464149a2e558707e49a4177decdaadd8222 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -168,6 +168,12 @@ void OnUserManagerGuestProfileCreated(
} else if (profile_open_action ==
profiles::USER_MANAGER_SELECT_PROFILE_ABOUT_CHROME) {
page += profiles::kUserManagerSelectProfileAboutChrome;
+ } else if (profile_open_action ==
+ profiles::USER_MANAGER_SELECT_PROFILE_CHROME_SETTINGS) {
+ page += profiles::kUserManagerSelectProfileChromeSettings;
+ } else if (profile_open_action ==
+ profiles::USER_MANAGER_SELECT_PROFILE_CHROME_MEMORY) {
+ page += profiles::kUserManagerSelectProfileChromeMemory;
}
callback.Run(guest_profile, page);
}
@@ -189,6 +195,8 @@ namespace profiles {
const char kUserManagerDisplayTutorial[] = "#tutorial";
const char kUserManagerSelectProfileTaskManager[] = "#task-manager";
const char kUserManagerSelectProfileAboutChrome[] = "#about-chrome";
+const char kUserManagerSelectProfileChromeSettings[] = "#chrome-settings";
+const char kUserManagerSelectProfileChromeMemory[] = "#chrome-memory";
void FindOrCreateNewWindowForProfile(
Profile* profile,
@@ -272,7 +280,7 @@ void CreateAndSwitchToNewProfile(chrome::HostDesktopType desktop_type,
}
void GuestBrowserCloseSuccess(const base::FilePath& profile_path) {
- UserManager::Show(profile_path,
+ UserManager::Show(base::FilePath(),
profiles::USER_MANAGER_NO_TUTORIAL,
profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
}

Powered by Google App Engine
This is Rietveld 408576698