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

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

Issue 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset (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_image.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 61956aa3d24ec4c310e7cca22aa997eaa82ef94d..22a587df5bbdadf03b6571812a601a093396f557 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -561,7 +561,7 @@ void UserManagerImpl::SaveUserImageFromFile(const std::string& username,
void UserManagerImpl::SaveUserImageFromProfileImage(
const std::string& username) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (!downloaded_profile_image_.empty()) {
+ if (!downloaded_profile_image_.isNull()) {
// Profile image has already been downloaded, so save it to file right now.
DCHECK(profile_image_url_.is_valid());
SaveUserImageInternal(
@@ -974,7 +974,7 @@ void UserManagerImpl::SetUserImage(const std::string& username,
DCHECK(user->image_index() != User::kInvalidImageIndex ||
is_current_user_new_);
bool image_changed = user->image_index() != User::kInvalidImageIndex;
- if (!user_image.image().empty())
+ if (!user_image.image().isNull())
user->SetImage(user_image, image_index);
else
user->SetStubImage(image_index);
@@ -1111,7 +1111,7 @@ bool UserManagerImpl::SaveBitmapToFile(const UserImage& user_image,
void UserManagerImpl::InitDownloadedProfileImage() {
DCHECK(logged_in_user_);
DCHECK_EQ(logged_in_user_->image_index(), User::kProfileImageIndex);
- if (downloaded_profile_image_.empty() && !logged_in_user_->image_is_stub()) {
+ if (downloaded_profile_image_.isNull() && !logged_in_user_->image_is_stub()) {
VLOG(1) << "Profile image initialized";
downloaded_profile_image_ = logged_in_user_->image();
downloaded_profile_image_data_url_ =
« no previous file with comments | « chrome/browser/chromeos/login/user_image.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698