trunk/src/chrome/browser/ui/ash/session_state_delegate_views.h - Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

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

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 8 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: trunk/src/chrome/browser/ui/ash/session_state_delegate_views.h

===================================================================

--- trunk/src/chrome/browser/ui/ash/session_state_delegate_views.h (revision 267249)

+++ trunk/src/chrome/browser/ui/ash/session_state_delegate_views.h (working copy)

@@ -5,7 +5,7 @@

#ifndef CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_VIEWS_H_

#define CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_VIEWS_H_

-#include "ash/session/session_state_delegate.h"

+#include "ash/session_state_delegate.h"

#include "base/basictypes.h"

#include "base/compiler_specific.h"

#include "base/observer_list.h"

@@ -34,11 +34,17 @@

virtual void UnlockScreen() OVERRIDE;

virtual bool IsUserSessionBlocked() const OVERRIDE;

virtual SessionState GetSessionState() const OVERRIDE;

- virtual const ash::UserInfo* GetUserInfo(

+ virtual const base::string16 GetUserDisplayName(

ash::MultiProfileIndex index) const OVERRIDE;

- virtual const ash::UserInfo* GetUserInfo(

+ virtual const base::string16 GetUserGivenName(

+ ash::MultiProfileIndex index) const OVERRIDE;

+ virtual const std::string GetUserEmail(

+ ash::MultiProfileIndex index) const OVERRIDE;

+ virtual const std::string GetUserID(

+ ash::MultiProfileIndex index) const OVERRIDE;

+ virtual const gfx::ImageSkia& GetUserImage(

content::BrowserContext* context) const OVERRIDE;

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

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

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

virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;

virtual void AddSessionStateObserver(