ash/desktop_background/wallpaper_resizer.cc - Issue 236013002: Apply default wallpaper from customization manifest.

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 236013002: Apply default wallpaper from customization manifest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove wallpaper URL from ServicesCustomizationDocumentTest. 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

« no previous file with comments | « ash/desktop_background/wallpaper_resizer.h ('k') | chrome/browser/chromeos/customization_document.h » ('j') | chrome/browser/chromeos/customization_document_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/desktop_background/wallpaper_resizer.cc

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

index 46497b2c1c84b6b45a7d36c0acbdee4e7dfd540e..4bd0264c584c3112202eba3ce420a08a378a4947 100644

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

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

@@ -93,8 +93,6 @@ void Resize(SkBitmap orig_bitmap,

} // namespace

-const int kInvalidResourceID = -1;

// static

uint32_t WallpaperResizer::GetImageId(const gfx::ImageSkia& image) {

const gfx::ImageSkiaRep& image_rep = image.GetRepresentation(1.0f);

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

WallpaperLayout layout)

: image_(image),

original_image_id_(GetImageId(image_)),

- resource_id_(kInvalidResourceID),

+ resource_id_(DesktopBackgroundController::kInvalidResourceID),

target_size_(target_size),

layout_(layout),

weak_ptr_factory_(this) {