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

Unified Diff: chrome/browser/chromeos/login/user.cc

Issue 10831064: [cros] Remove redundant PNG enconding in UserImage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
Index: chrome/browser/chromeos/login/user.cc
diff --git a/chrome/browser/chromeos/login/user.cc b/chrome/browser/chromeos/login/user.cc
index ab451002f2114121a1b1243fa72f014356d2e3f1..835b0bd0693debacec38b64899d02a3e88d79214 100644
--- a/chrome/browser/chromeos/login/user.cc
+++ b/chrome/browser/chromeos/login/user.cc
@@ -8,16 +8,11 @@
#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 {
namespace {
-// Resource ID of the image to use as stub image.
-const int kStubImageResourceID = IDR_PROFILE_PICTURE_LOADING;
-
// Returns account name portion of an email.
std::string GetUserName(const std::string& email) {
std::string::size_type i = email.find('@');
@@ -37,8 +32,6 @@ const char kGuestUser[] = "";
User::User(const std::string& email)
: email_(email),
- user_image_(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- kDefaultImageResources[0])),
oauth_token_status_(OAUTH_TOKEN_STATUS_UNKNOWN),
image_index_(kInvalidImageIndex),
image_is_stub_(false) {
@@ -61,8 +54,7 @@ void User::SetImageURL(const GURL& image_url) {
}
void User::SetStubImage(int image_index) {
- user_image_.SetImage(*ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
- kStubImageResourceID));
+ user_image_ = UserImage();
image_index_ = image_index;
image_is_stub_ = true;
}

Powered by Google App Engine
This is Rietveld 408576698