ash: HiDPI user avatar for SessionController

ash/common/system/user/user_card_view.cc

 // Copyright 2014 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/common/system/user/user_card_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
@@ skipping 47 matching lines @@
 const base::char16 kDisplayNameMark[] = {0x2060, 0};
 
 views::View* CreateUserAvatarView(LoginStatus login_status, int user_index) {
   RoundedImageView* image_view = new RoundedImageView(kTrayItemSize / 2);
   if (login_status == LoginStatus::GUEST) {
     gfx::ImageSkia icon =
         gfx::CreateVectorIcon(kSystemMenuGuestIcon, kMenuIconColor);
     image_view->SetImage(icon, icon.size());
   } else {
     SessionController* controller = Shell::Get()->session_controller();
-    // TODO(xiyuan); HiDpi avatar support. http://crbug.com/702689
-    image_view->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(
-                             controller->GetUserSession(user_index)->avatar),
+    image_view->SetImage(controller->GetUserSession(user_index)->avatar,
                          gfx::Size(kTrayItemSize, kTrayItemSize));
   }
 
   image_view->SetBorder(views::CreateEmptyBorder(gfx::Insets(
       (kTrayPopupItemMinStartWidth - image_view->GetPreferredSize().width()) /
       2)));
   return image_view;
 }
 
 // The user details shown in public account mode. This is essentially a label
@@ skipping 382 matching lines @@
 
     media_capture_icon_->set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
     AddChildView(media_capture_icon_);
 
     Shell::Get()->media_controller()->RequestCaptureState();
   }
 }
 
 }  // namespace tray
 }  // namespace ash