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

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: 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 93524af7637413dec75f2a1973150844ddd1a9de..382aeec5beef506cd68320f199e7866f4eb65b14 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -155,7 +155,8 @@ void OnUserManagerGuestProfileCreated(
if (tutorial_mode == profiles::USER_MANAGER_TUTORIAL_OVERVIEW) {
page += profiles::kUserManagerDisplayTutorial;
- } else if (!profile_path_to_focus.empty()) {
+ } else if (!profile_path_to_focus.empty() &&
+ profile_path_to_focus != ProfileManager::GetGuestProfilePath()) {
noms (inactive) 2014/10/07 21:25:48 Not sure why this would happen. Up until now, |pro
Mike Lerman 2014/10/08 15:41:37 It was! Until someone (rhymes with poms) changed c
const ProfileInfoCache& cache =
g_browser_process->profile_manager()->GetProfileInfoCache();
size_t index = cache.GetIndexOfProfileWithPath(profile_path_to_focus);
@@ -169,6 +170,9 @@ 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;
}
callback.Run(guest_profile, page);
}
@@ -190,6 +194,7 @@ namespace profiles {
const char kUserManagerDisplayTutorial[] = "#tutorial";
const char kUserManagerSelectProfileTaskManager[] = "#task-manager";
const char kUserManagerSelectProfileAboutChrome[] = "#about-chrome";
+const char kUserManagerSelectProfileChromeSettings[] = "#chrome-settings";
void FindOrCreateNewWindowForProfile(
Profile* profile,

Powered by Google App Engine
This is Rietveld 408576698