chrome/browser/ui/ash/multi_user/multi_user_util.cc - Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

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/ui/ash/multi_user/multi_user_util.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 6 years, 5 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/ui/ash/multi_user/multi_user_util.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util.cc b/chrome/browser/ui/ash/multi_user/multi_user_util.cc

index 9aecd9302ed313b22aaa4bdf208ecddc1cf4bbd6..4a44596fa82a78ab4d4d0ffab34131261ef34678 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_util.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_util.cc

@@ -63,7 +63,7 @@ Profile* GetProfileFromWindow(aura::Window* window) {

bool IsProfileFromActiveUser(Profile* profile) {

#if defined(OS_CHROMEOS)

return GetUserIDFromProfile(profile) ==

- chromeos::UserManager::Get()->GetActiveUser()->email();

+ chromeos::GetUserManager()->GetActiveUser()->email();

#else

// In non Chrome OS configurations this will be always true since this only

// makes sense in separate desktop mode.

@@ -73,7 +73,7 @@ bool IsProfileFromActiveUser(Profile* profile) {

const std::string& GetCurrentUserId() {

#if defined(OS_CHROMEOS)

- return chromeos::UserManager::Get()->GetActiveUser()->email();

+ return chromeos::GetUserManager()->GetActiveUser()->email();

#else

return base::EmptyString();

#endif