Move avatar holder code to ash

ash/system/user/tray_user.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/user/tray_user.h"
 
 #include <algorithm>
 #include <climits>
 #include <vector>
 
@@ skipping 903 matching lines @@
 
 views::View* UserView::CreateIconForUserCard(user::LoginStatus login) {
   RoundedImageView* icon = new RoundedImageView(kProfileRoundedCornerRadius,
                                                 multiprofile_index_ == 0);
   icon->SetEnabled(false);
   if (login == user::LOGGED_IN_GUEST) {
     icon->SetImage(*ui::ResourceBundle::GetSharedInstance().
         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;
 }
 
 void UserView::AddLoggedInRetailModeUserCardContent() {
   views::Label* details = new views::Label;
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   details->SetText(
       bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_KIOSK_LABEL));
   details->SetBorder(views::Border::CreateEmptyBorder(0, 4, 0, 1));
@@ skipping 387 matching lines @@
 void TrayUser::UpdateAvatarImage(user::LoginStatus status) {
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   if (!avatar_ ||
       GetTrayIndex() >= session_state_delegate->NumberOfLoggedInUsers())
     return;
 
   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())
     avatar_->SetSize(gfx::Size(icon_size, icon_size));
 }
 
 MultiProfileIndex TrayUser::GetTrayIndex() {
   Shell* shell = Shell::GetInstance();
   // If multi profile is not enabled we can use the normal index.
   if (!shell->delegate()->IsMultiProfilesEnabled())
     return multiprofile_index_;
   // In case of multi profile we need to mirror the indices since the system
   // tray items are in the reverse order then the menu items.
   return shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers() -
              1 - multiprofile_index_;
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   internal::RootWindowController* controller =
       internal::GetRootWindowController(
           system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
   if (controller && controller->shelf()) {
     UpdateAfterShelfAlignmentChange(
         controller->GetShelfLayoutManager()->GetAlignment());
   }
 }
 
 }  // namespace internal
 }  // namespace ash