ash/test/test_user_wallpaper_delegate.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/test/test_user_wallpaper_delegate.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 clang debug build. 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/test/test_user_wallpaper_delegate.cc

diff --git a/ash/test/test_user_wallpaper_delegate.cc b/ash/test/test_user_wallpaper_delegate.cc

index 24ab287e5636d4830182646399ffcf690c491229..050f635c7c54e809617fa7482e599e5a1dcb329b 100644

--- a/ash/test/test_user_wallpaper_delegate.cc

+++ b/ash/test/test_user_wallpaper_delegate.cc

@@ -18,7 +18,7 @@ TestUserWallpaperDelegate::~TestUserWallpaperDelegate() {}

void TestUserWallpaperDelegate::UpdateWallpaper(bool clear_cache) {

DefaultUserWallpaperDelegate::UpdateWallpaper(clear_cache);

if (!custom_wallpaper_.isNull()) {

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

+ Shell::GetInstance()->desktop_background_controller()->SetWallpaperImage(

custom_wallpaper_, WALLPAPER_LAYOUT_STRETCH);

}

update_wallpaper_count_++;

« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | chrome/browser/chromeos/extensions/wallpaper_api.cc » ('j') | no next file with comments »