Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(375)

Unified Diff: chrome/browser/ui/ash/session_controller_client.cc

Issue 2770693002: ash: HiDPI user avatar for SessionController (Closed)
Patch Set: fix gn check Created 3 years, 9 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/session_controller_client.cc
diff --git a/chrome/browser/ui/ash/session_controller_client.cc b/chrome/browser/ui/ash/session_controller_client.cc
index 4e503c120a7db267f4db2277d63fa3dc267192d6..ffc85f44c17e10f2607d45cc5d9247cdec4eb2cd 100644
--- a/chrome/browser/ui/ash/session_controller_client.cc
+++ b/chrome/browser/ui/ash/session_controller_client.cc
@@ -62,12 +62,13 @@ ash::mojom::UserSessionPtr UserToUserSession(const User& user) {
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();
+ // Make sure all representations are loaded before sending via mojo.
msw 2017/03/23 20:47:51 Hmm, I wonder if there's a way to ensure we always
xiyuan 2017/03/24 05:45:19 I left this part out of traits because only caller
+ user.GetImage().EnsureRepsForSupportedScales();
+
+ 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;

Powered by Google App Engine
This is Rietveld 408576698