diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 17:15:27 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 17:15:27 +0000 |
| commit | e1272045536e5261a8d5565d1eed08b32f8314cf (patch) | |
| tree | 353af8a696d12111b6884cfa55983750149ed780 /ash/system | |
| parent | 46629cefcccebe73fec85422ebd40beeae2b1515 (diff) | |
| download | chromium_src-e1272045536e5261a8d5565d1eed08b32f8314cf.zip chromium_src-e1272045536e5261a8d5565d1eed08b32f8314cf.tar.gz chromium_src-e1272045536e5261a8d5565d1eed08b32f8314cf.tar.bz2 | |
Move avatar holder img/code to ash
Removed GetLoggedInUsers method that is no longer used.
I'm planning to move frame related code to ash/frame (such as custom_frame_view_ash, caption).
BUG=338782
Review URL: https://codereview.chromium.org/197773004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/user/tray_user.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index bd01bbe..8384b9e5 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -921,10 +921,12 @@ views::View* UserView::CreateIconForUserCard(user::LoginStatus login) { GetImageNamed(IDR_AURA_UBER_TRAY_GUEST_ICON).ToImageSkia(), gfx::Size(kUserIconSize, kUserIconSize)); } else { - icon->SetImage( - Shell::GetInstance()->session_state_delegate()-> - GetUserImage(multiprofile_index_), - gfx::Size(kUserIconSize, kUserIconSize)); + SessionStateDelegate* delegate = + Shell::GetInstance()->session_state_delegate(); + content::BrowserContext* context = delegate->GetBrowserContextByIndex( + multiprofile_index_); + icon->SetImage(delegate->GetUserImage(context), + gfx::Size(kUserIconSize, kUserIconSize)); } return icon; } @@ -1332,10 +1334,10 @@ void TrayUser::UpdateAvatarImage(user::LoginStatus status) { int icon_size = switches::UseAlternateShelfLayout() ? kUserIconLargeSize : kUserIconSize; - avatar_->SetImage( - Shell::GetInstance()->session_state_delegate()->GetUserImage( - GetTrayIndex()), - gfx::Size(icon_size, icon_size)); + content::BrowserContext* context = session_state_delegate-> + GetBrowserContextByIndex(GetTrayIndex()); + avatar_->SetImage(session_state_delegate->GetUserImage(context), + gfx::Size(icon_size, icon_size)); // Unit tests might come here with no images for some users. if (avatar_->size().IsEmpty()) |