chrome/browser/ui/ash/session_state_delegate_views.h - Issue 197773004: Move avatar holder code to ash

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 197773004: Move avatar holder code to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: clang fix Created 6 years, 9 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 f5f194df269dafb4f7bf968bcffc301e6b479d28..c9a4f08d3527f1a4cf311b055faebfa475b2abeb 100644

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

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

@@ -20,6 +20,8 @@ class SessionStateDelegate : public ash::SessionStateDelegate {

virtual ~SessionStateDelegate();

// ash::SessionStateDelegate:

+ virtual content::BrowserContext* GetBrowserContextByIndex(

+ ash::MultiProfileIndex index) OVERRIDE;

virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;

virtual int NumberOfLoggedInUsers() const OVERRIDE;

virtual bool IsActiveUserSessionStarted() const OVERRIDE;

@@ -36,8 +38,8 @@ class SessionStateDelegate : public ash::SessionStateDelegate {

virtual const std::string GetUserID(

ash::MultiProfileIndex index) const OVERRIDE;

virtual const gfx::ImageSkia& GetUserImage(

- ash::MultiProfileIndex index) const OVERRIDE;

- virtual void GetLoggedInUsers(ash::UserIdList* users) OVERRIDE;

+ content::BrowserContext* context) 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(