chrome/browser/ui/ash/user_wallpaper_delegate_win.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: chrome/browser/ui/ash/user_wallpaper_delegate_win.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: Fix windows build. Created 6 years, 9 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/ash/user_wallpaper_delegate_win.cc

diff --git a/chrome/browser/ui/ash/user_wallpaper_delegate_win.cc b/chrome/browser/ui/ash/user_wallpaper_delegate_win.cc

index c058b59c0e520460a423f67d73b7d7c232a7a96b..adab36d9f6a4438bc7eff1cb594f1fe42b58431f 100644

--- a/chrome/browser/ui/ash/user_wallpaper_delegate_win.cc

+++ b/chrome/browser/ui/ash/user_wallpaper_delegate_win.cc

@@ -59,7 +59,7 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {

#endif

gfx::ImageSkia wallpaper = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);

ash::Shell::GetInstance()->desktop_background_controller()->

- SetCustomWallpaper(wallpaper, ash::WALLPAPER_LAYOUT_TILE);

+ SetWallpaper(wallpaper, ash::WALLPAPER_LAYOUT_TILE);

}

virtual void InitializeWallpaper() OVERRIDE {

« chrome/browser/chromeos/login/wallpaper_manager.cc ('K') | « chrome/browser/chromeos/login/wallpaper_manager_unittest.cc ('k') | no next file » | no next file with comments »