ash/system/user/tray_user.cc - Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

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: ash/system/user/tray_user.cc

Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix tests 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: ash/system/user/tray_user.cc

diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc

index 2a8dfe139345acc6af7b57c11d1efdee97953003..cb5676c05a6fb36f15820502bd0bc4e0cee9f968 100644

--- a/ash/system/user/tray_user.cc

+++ b/ash/system/user/tray_user.cc

@@ -6,7 +6,8 @@

#include "ash/ash_switches.h"

#include "ash/root_window_controller.h"

-#include "ash/session_state_delegate.h"

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

+#include "ash/session/user_info.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shell_delegate.h"

#include "ash/system/tray/system_tray.h"

@@ -263,7 +264,7 @@ void TrayUser::UpdateAvatarImage(user::LoginStatus status) {

content::BrowserContext* context = session_state_delegate->

GetBrowserContextByIndex(GetTrayIndex());

- avatar_->SetImage(session_state_delegate->GetUserImage(context),

+ avatar_->SetImage(session_state_delegate->GetUserInfo(context)->GetImage(),

gfx::Size(kTrayAvatarSize, kTrayAvatarSize));

// Unit tests might come here with no images for some users.

« no previous file with comments | « ash/system/user/tray_user.h ('k') | ash/system/user/tray_user_separator.cc » ('j') | no next file with comments »