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

Unified Diff: chrome/browser/chromeos/login/user_manager_impl.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 5c407715a771ab8a8d96bbdfa00991c088c5f20a..db4dd135d7c3e31d60c335d2902ff76fc7861b2e 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -609,10 +609,10 @@ Profile* UserManagerImpl::GetProfileByUser(const User* user) const {
if (IsMultipleProfilesAllowed() && user->is_profile_created())
profile = ProfileHelper::GetProfileByUserIdHash(user->username_hash());
else
- profile = g_browser_process->profile_manager()->GetDefaultProfile();
+ profile = ProfileManager::GetActiveUserProfile();
- // GetDefaultProfile() or GetProfileByUserIdHash() returns a new instance of
- // ProfileImpl(), but actually its OffTheRecordProfile() should be used.
+ // GetActiveUserProfile() or GetProfileByUserIdHash() returns a new instance
+ // of ProfileImpl(), but actually its OffTheRecordProfile() should be used.
if (profile && IsLoggedInAsGuest())
profile = profile->GetOffTheRecordProfile();
return profile;
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698