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

Unified Diff: chrome/browser/ui/webui/options2/chromeos/user_image_source.cc

Issue 10829234: [cros] Fix regression making impossible to select grey G+ avatar, now for realz. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
index b24a61c5126bc2f5b3be44c80e81d08d7e508169..c9bbb1ba10223f9a4e71309b94510aa37b29148a 100644
--- a/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/user_image_source.cc
@@ -73,6 +73,9 @@ base::RefCountedMemory* UserImageSource::GetUserImage(
return new base::RefCountedBytes(user->animated_image());
} else if (user->has_raw_image()) {
return new base::RefCountedBytes(user->raw_image());
+ } else if (user->image_is_stub()) {
+ return ResourceBundle::GetSharedInstance().
+ LoadDataResourceBytes(IDR_PROFILE_PICTURE_LOADING, scale_factor);
} else if (user->HasDefaultImage()) {
return ResourceBundle::GetSharedInstance().
LoadDataResourceBytes(kDefaultImageResourceIDs[user->image_index()],
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698