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

Unified Diff: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.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
Index: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
index 676f8e91efde4d1b253220af1604a610a1485779..f6058e4ad444184b1b5ea3c013bcf9132fcd7fc7 100644
--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
@@ -285,7 +285,7 @@ void ChangePictureOptionsHandler::UpdateProfileImage() {
// If we have a downloaded profile image and haven't sent it in
// |SendSelectedImage|, send it now (without selecting).
if (previous_image_index_ != User::kProfileImageIndex &&
- !user_manager->DownloadedProfileImage().empty())
+ !user_manager->DownloadedProfileImage().isNull())
SendProfileImage(user_manager->DownloadedProfileImage(), false);
user_manager->DownloadProfileImage(kProfileDownloadReason);
@@ -315,7 +315,7 @@ void ChangePictureOptionsHandler::HandleSelectImage(const ListValue* args) {
// this URL, too.
if (previous_image_index_ == User::kExternalImageIndex) {
- DCHECK(!previous_image_.empty());
+ DCHECK(!previous_image_.isNull());
user_manager->SaveUserImage(user.email(),
UserImage::CreateAndEncode(previous_image_));
} else {
@@ -339,7 +339,7 @@ void ChangePictureOptionsHandler::HandleSelectImage(const ListValue* args) {
VLOG(1) << "Selected default user image: " << image_index;
} else if (image_url == user_photo_data_url_) {
// Camera image is selected.
- if (user_photo_.empty()) {
+ if (user_photo_.isNull()) {
DCHECK(image_decoder_.get());
waiting_for_camera_photo = true;
VLOG(1) << "Still waiting for camera image to decode";

Powered by Google App Engine
This is Rietveld 408576698