chrome/browser/ui/ash/session_state_delegate_chromeos.cc - Issue 379803004: Move UserInfo to user_manager.

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/session_state_delegate_chromeos.cc

Issue 379803004: Move UserInfo to user_manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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/session_state_delegate_chromeos.cc

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

index ad073e65da68519e4bbd220fbcef762bbb2a3ed7..27e57f45b86a984c04c31e13010097fdf5d60ceb 100644

--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc

@@ -133,13 +133,13 @@ SessionStateDelegateChromeos::GetSessionState() const {

return session_state_;

}

-const ash::UserInfo* SessionStateDelegateChromeos::GetUserInfo(

+const user_manager::UserInfo* SessionStateDelegateChromeos::GetUserInfo(

ash::MultiProfileIndex index) const {

DCHECK_LT(index, NumberOfLoggedInUsers());

return chromeos::UserManager::Get()->GetLRULoggedInUsers()[index];

}

-const ash::UserInfo* SessionStateDelegateChromeos::GetUserInfo(

+const user_manager::UserInfo* SessionStateDelegateChromeos::GetUserInfo(

content::BrowserContext* context) const {

DCHECK(context);

return chromeos::ProfileHelper::Get()->GetUserByProfile(