ash: HiDPI user avatar for SessionController

chrome/browser/ui/ash/session_controller_client.cc

 // Copyright 2016 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 "chrome/browser/ui/ash/session_controller_client.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/public/cpp/session_types.h"
@@ skipping 44 matching lines @@
   if (user_session_id == 0u)
     return nullptr;
 
   ash::mojom::UserSessionPtr session = ash::mojom::UserSession::New();
   session->session_id = user_session_id;
   session->type = user.GetType();
   session->account_id = user.GetAccountId();
   session->display_name = base::UTF16ToUTF8(user.display_name());
   session->display_email = user.display_email();
 
-  // TODO(xiyuan): Support multiple scale factor.
-  session->avatar = *user.GetImage().bitmap();
+  session->avatar = user.GetImage();
   if (session->avatar.isNull()) {
-    session->avatar = *ResourceBundle::GetSharedInstance()
-                           .GetImageSkiaNamed(IDR_PROFILE_PICTURE_LOADING)
-                           ->bitmap();
+    session->avatar = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+        IDR_PROFILE_PICTURE_LOADING);
   }
 
   return session;
 }
 
 void DoSwitchUser(const AccountId& account_id) {
   UserManager::Get()->SwitchActiveUser(account_id);
 }
 
 }  // namespace
@@ skipping 206 matching lines @@
   const UserList logged_in_users = user_manager->GetLoggedInUsers();
   std::vector<uint32_t> user_session_ids;
   for (auto* user : user_manager->GetLRULoggedInUsers()) {
     const uint32_t user_session_id = GetSessionId(*user);
     DCHECK_NE(0u, user_session_id);
     user_session_ids.push_back(user_session_id);
   }
 
   session_controller_->SetUserSessionOrder(user_session_ids);
 }