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

Unified Diff: components/user_manager/user_image/user_image.cc

Issue 1747843002: Rename raw_image() to image_bytes() in UserImage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 10 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 | « components/user_manager/user_image/user_image.h ('k') | components/wallpaper/wallpaper_manager_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/user_manager/user_image/user_image.cc
diff --git a/components/user_manager/user_image/user_image.cc b/components/user_manager/user_image/user_image.cc
index e9937dab81a81fe636788dbd73658760fd7d992f..af37983437abbc3b85fd616137dbcd279ebafbb3 100644
--- a/components/user_manager/user_image/user_image.cc
+++ b/components/user_manager/user_image/user_image.cc
@@ -16,7 +16,7 @@ namespace {
const int kDefaultEncodingQuality = 90;
bool EncodeImageSkia(const gfx::ImageSkia& image,
- std::vector<unsigned char>* output) {
+ UserImage::Bytes* output) {
TRACE_EVENT2("oobe", "EncodeImageSkia",
"width", image.width(), "height", image.height());
if (image.isNull())
@@ -36,9 +36,9 @@ bool EncodeImageSkia(const gfx::ImageSkia& image,
// static
UserImage UserImage::CreateAndEncode(const gfx::ImageSkia& image) {
- RawImage raw_image;
- if (EncodeImageSkia(image, &raw_image)) {
- UserImage result(image, raw_image);
+ Bytes image_bytes;
+ if (EncodeImageSkia(image, &image_bytes)) {
+ UserImage result(image, image_bytes);
result.MarkAsSafe();
return result;
}
@@ -46,31 +46,27 @@ UserImage UserImage::CreateAndEncode(const gfx::ImageSkia& image) {
}
UserImage::UserImage()
- : has_raw_image_(false),
+ : has_image_bytes_(false),
is_safe_format_(false) {
}
UserImage::UserImage(const gfx::ImageSkia& image)
: image_(image),
- has_raw_image_(false),
+ has_image_bytes_(false),
is_safe_format_(false) {
}
UserImage::UserImage(const gfx::ImageSkia& image,
- const RawImage& raw_image)
+ const Bytes& image_bytes)
: image_(image),
- has_raw_image_(false),
+ has_image_bytes_(false),
is_safe_format_(false) {
- has_raw_image_ = true;
- raw_image_ = raw_image;
+ has_image_bytes_ = true;
+ image_bytes_ = image_bytes;
}
UserImage::~UserImage() {}
-void UserImage::DiscardRawImage() {
- RawImage().swap(raw_image_); // Clear |raw_image_|.
-}
-
void UserImage::MarkAsSafe() {
is_safe_format_ = true;
}
« no previous file with comments | « components/user_manager/user_image/user_image.h ('k') | components/wallpaper/wallpaper_manager_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698