| Index: chrome/browser/profiles/avatar_menu_desktop.cc
|
| diff --git a/chrome/browser/profiles/avatar_menu_desktop.cc b/chrome/browser/profiles/avatar_menu_desktop.cc
|
| index 35949a5ef7ec71e3733745a0633c68251d9654ab..01758c856a25394893eb39ade2e600c912b87474 100644
|
| --- a/chrome/browser/profiles/avatar_menu_desktop.cc
|
| +++ b/chrome/browser/profiles/avatar_menu_desktop.cc
|
| @@ -6,8 +6,10 @@
|
|
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/profiles/profile_avatar_icon_util.h"
|
| #include "chrome/browser/profiles/profile_info_cache.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| +#include "ui/base/resource/resource_bundle.h"
|
|
|
| // static
|
| void AvatarMenu::GetImageForMenuButton(Profile* profile,
|
| @@ -21,7 +23,11 @@ void AvatarMenu::GetImageForMenuButton(Profile* profile,
|
| return;
|
| }
|
|
|
| - *image = cache.GetAvatarIconOfProfileAtIndex(index);
|
| + // Ensure we are using the default resource, not the downloaded high-res one.
|
| + const size_t icon_index = cache.GetAvatarIconIndexOfProfileAtIndex(index);
|
| + const int resource_id =
|
| + profiles::GetDefaultAvatarIconResourceIDAtIndex(icon_index);
|
| + *image = ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
|
| *is_rectangle =
|
| cache.IsUsingGAIAPictureOfProfileAtIndex(index) &&
|
| cache.GetGAIAPictureOfProfileAtIndex(index);
|
|
|