ash/desktop_background/wallpaper_resizer.cc - Issue 215293003: Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/desktop_background/wallpaper_resizer.cc

Issue 215293003: Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review. Created 6 years, 8 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: ash/desktop_background/wallpaper_resizer.cc

diff --git a/ash/desktop_background/wallpaper_resizer.cc b/ash/desktop_background/wallpaper_resizer.cc

index 06d8c97da7d53c54b0e06d40c72c8488314c314c..f01b23f53e75bf004b0a510e631aace927769465 100644

--- a/ash/desktop_background/wallpaper_resizer.cc

+++ b/ash/desktop_background/wallpaper_resizer.cc

@@ -102,9 +102,11 @@ uint32_t WallpaperResizer::GetImageId(const gfx::ImageSkia& image) {

WallpaperResizer::WallpaperResizer(int image_resource_id,

const gfx::Size& target_size,

WallpaperLayout layout)

- : image_(*(ui::ResourceBundle::GetSharedInstance().

- GetImageNamed(image_resource_id).ToImageSkia())),

+ : image_(*(ui::ResourceBundle::GetSharedInstance()

+ .GetImageNamed(image_resource_id)

+ .ToImageSkia())),

original_image_id_(GetImageId(image_)),

+ resource_id_(image_resource_id),

target_size_(target_size),

layout_(layout),

weak_ptr_factory_(this) {

@@ -116,6 +118,7 @@ WallpaperResizer::WallpaperResizer(const gfx::ImageSkia& image,

WallpaperLayout layout)

: image_(image),

original_image_id_(GetImageId(image_)),

+ resource_id_(-1),

bshe 2014/04/07 15:49:16 nit: could you replace -1 with something like: con

Alexander Alekseev 2014/04/08 13:18:49 Done.

target_size_(target_size),

layout_(layout),

weak_ptr_factory_(this) {

« ash/desktop_background/desktop_background_controller.h ('K') | « ash/desktop_background/wallpaper_resizer.h ('k') | ash/test/ash_test_base.h » ('j') | ash/test/ash_test_base.h » ('J')