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

Unified Diff: chrome/browser/chromeos/login/user.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 | « no previous file | chrome/browser/chromeos/login/user_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user.cc
diff --git a/chrome/browser/chromeos/login/user.cc b/chrome/browser/chromeos/login/user.cc
index 8e8715722365305d64633adfbe7244f3dd041697..814ed1f9d766a15688eda79c536526ac7d87b5af 100644
--- a/chrome/browser/chromeos/login/user.cc
+++ b/chrome/browser/chromeos/login/user.cc
@@ -8,6 +8,8 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/default_user_images.h"
#include "chrome/browser/chromeos/login/user_manager.h"
+#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
namespace chromeos {
@@ -55,7 +57,9 @@ void User::SetImageURL(const GURL& image_url) {
}
void User::SetStubImage(int image_index) {
- user_image_ = UserImage();
+ user_image_ = UserImage(
+ *ResourceBundle::GetSharedInstance().
+ GetImageSkiaNamed(IDR_PROFILE_PICTURE_LOADING));
image_index_ = image_index;
image_is_stub_ = true;
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698