chrome/browser/profiles/profile_manager.cc - Issue 127963004: Removal of GetDefaultProfile from UserManagerImpl

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

Issue 127963004: Removal of GetDefaultProfile from UserManagerImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: The replacement was causing a recursion in some cases Created 6 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:

Index: chrome/browser/profiles/profile_manager.cc

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

index fa424773921d0c06bb25f3322813fd8f62967df4..df865407d29459816c6de0c5a1daa55b0c522f3b 100644

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

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

@@ -418,7 +418,9 @@ Profile* ProfileManager::GetPrimaryUserProfile() {

Profile* ProfileManager::GetActiveUserProfile() {

#if defined(OS_CHROMEOS)

ProfileManager* profile_manager = g_browser_process->profile_manager();

- if (!profile_manager->IsLoggedIn() || !chromeos::UserManager::IsInitialized())

+ if (!chromeos::UserManager::IsMultipleProfilesAllowed() ||

+ !profile_manager->IsLoggedIn() ||

+ !chromeos::UserManager::IsInitialized())

return GetDefaultProfile();

chromeos::UserManager* manager = chromeos::UserManager::Get();

// Note: The user manager will take care of guest profiles.

« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | no next file » | no next file with comments »