| Index: chrome/browser/profiles/profile_info_cache.cc
|
| diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc
|
| index 4e6803e2ceb57727fbdd9386df1918ab01c384ac..e5736679d36d3a6c5f09915e730f4817b27389b0 100644
|
| --- a/chrome/browser/profiles/profile_info_cache.cc
|
| +++ b/chrome/browser/profiles/profile_info_cache.cc
|
| @@ -1006,8 +1006,12 @@ const gfx::Image* ProfileInfoCache::GetHighResAvatarOfProfileAtIndex(
|
| int avatar_index = GetAvatarIconIndexOfProfileAtIndex(index);
|
| std::string key = profiles::GetDefaultAvatarIconFileNameAtIndex(avatar_index);
|
|
|
| - if (!strcmp(key.c_str(), profiles::GetNoHighResAvatarFileName()))
|
| - return NULL;
|
| + // If this is the placeholder avatar, it is already included in the
|
| + // resources, so it doesn't need to be downloaded.
|
| + if (!strcmp(key.c_str(), profiles::GetNoHighResAvatarFileName())) {
|
| + return &ui::ResourceBundle::GetSharedInstance().GetImageNamed(
|
| + profiles::GetPlaceholderAvatarIconResourceID());
|
| + }
|
|
|
| base::FilePath image_path =
|
| profiles::GetPathOfHighResAvatarAtIndex(avatar_index);
|
|
|