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

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

Issue 10830111: [cros] Encode user images when set from WebUI (regression fix). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes 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_image_loader.cc
diff --git a/chrome/browser/chromeos/login/user_image_loader.cc b/chrome/browser/chromeos/login/user_image_loader.cc
index 94925fcd812e92ac0b1b2d0b1fc77994119e1c58..45f82284b05eb4b63aac1a7f0df683c8ee6176ee 100644
--- a/chrome/browser/chromeos/login/user_image_loader.cc
+++ b/chrome/browser/chromeos/login/user_image_loader.cc
@@ -22,10 +22,8 @@ using content::BrowserThread;
namespace chromeos {
UserImageLoader::ImageInfo::ImageInfo(int size,
- bool load_raw_image,
const LoadedCallback& loaded_cb)
: size(size),
- load_raw_image(load_raw_image),
loaded_cb(loaded_cb) {
}
@@ -41,11 +39,10 @@ UserImageLoader::~UserImageLoader() {
void UserImageLoader::Start(const std::string& filepath,
int size,
- bool load_raw_image,
const LoadedCallback& loaded_cb) {
target_message_loop_ = MessageLoop::current();
- ImageInfo image_info(size, load_raw_image, loaded_cb);
+ ImageInfo image_info(size, loaded_cb);
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
base::Bind(&UserImageLoader::LoadImage, this, filepath, image_info));
@@ -96,15 +93,10 @@ void UserImageLoader::OnImageDecoded(const ImageDecoder* decoder,
}
}
- scoped_ptr<UserImage> user_image;
- if (image_info.load_raw_image)
- user_image.reset(new UserImage(final_image, decoder->get_image_data()));
- else
- user_image.reset(new UserImage(final_image));
-
target_message_loop_->PostTask(
FROM_HERE,
- base::Bind(image_info.loaded_cb, *user_image));
+ base::Bind(image_info.loaded_cb,
+ UserImage(final_image, decoder->get_image_data())));
image_info_map_.erase(info_it);
}

Powered by Google App Engine
This is Rietveld 408576698