chrome/browser/ui/ash/session_state_delegate_views.h - 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_views.h

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_views.h

diff --git a/chrome/browser/ui/ash/session_state_delegate_views.h b/chrome/browser/ui/ash/session_state_delegate_views.h

index 3b32b29b38230be500e332bfd618626a9228d69b..14e005e4f6920d8931a70c4d71b8cb8a77d8ff80 100644

--- a/chrome/browser/ui/ash/session_state_delegate_views.h

+++ b/chrome/browser/ui/ash/session_state_delegate_views.h

@@ -35,9 +35,9 @@ class SessionStateDelegate : public ash::SessionStateDelegate {

virtual void UnlockScreen() OVERRIDE;

virtual bool IsUserSessionBlocked() const OVERRIDE;

virtual SessionState GetSessionState() const OVERRIDE;

- virtual const ash::UserInfo* GetUserInfo(

+ virtual const user_manager::UserInfo* GetUserInfo(

ash::MultiProfileIndex index) const OVERRIDE;

- virtual const ash::UserInfo* GetUserInfo(

+ virtual const user_manager::UserInfo* GetUserInfo(

content::BrowserContext* context) const OVERRIDE;

virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;

virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;