| 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..54fbd57c4cfa06d5d43fbda9e595d1065ef95adb 100644
|
| --- a/chrome/browser/ui/ash/session_controller_client.cc
|
| +++ b/chrome/browser/ui/ash/session_controller_client.cc
|
| @@ -62,12 +62,10 @@ 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();
|
| + 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;
|
|
|