ash/accelerators/debug_commands.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/accelerators/debug_commands.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: ash/accelerators/debug_commands.cc

diff --git a/ash/accelerators/debug_commands.cc b/ash/accelerators/debug_commands.cc

index 4ca1720e3a00d581eebe5e70d3199d69d2488094..2529dfa6052bd44d5b95f4d6dd854ab5ab409ea5 100644

--- a/ash/accelerators/debug_commands.cc

+++ b/ash/accelerators/debug_commands.cc

@@ -44,17 +44,17 @@ bool CycleDesktopBackgroundMode() {

InitializeWallpaper();

break;

case 1:

- desktop_background_controller->SetCustomWallpaper(

+ desktop_background_controller->SetWallpaper(

CreateWallpaperImage(SK_ColorRED, SK_ColorBLUE),

WALLPAPER_LAYOUT_STRETCH);

break;

case 2:

- desktop_background_controller->SetCustomWallpaper(

+ desktop_background_controller->SetWallpaper(

CreateWallpaperImage(SK_ColorBLUE, SK_ColorGREEN),

WALLPAPER_LAYOUT_CENTER);

break;

case 3:

- desktop_background_controller->SetCustomWallpaper(

+ desktop_background_controller->SetWallpaper(

CreateWallpaperImage(SK_ColorGREEN, SK_ColorRED),

WALLPAPER_LAYOUT_CENTER_CROPPED);

break;

« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_controller.h » ('j') | ash/desktop_background/desktop_background_controller.h » ('J')