ash/desktop_background/desktop_background_controller.cc - Issue 10827368: ash: Avoid implicit conversion from ImageSkia into SkBitmap.

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/desktop_background_controller.cc

Issue 10827368: ash: Avoid implicit conversion from ImageSkia into SkBitmap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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:

Index: ash/desktop_background/desktop_background_controller.cc

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

index 917e0abe795fad5b810ff74aed4ad66844ab424d..6a94e2f98771352b9104975998d63695ed2395e9 100644

--- a/ash/desktop_background/desktop_background_controller.cc

+++ b/ash/desktop_background/desktop_background_controller.cc

@@ -124,9 +124,9 @@ WallpaperLayout DesktopBackgroundController::GetWallpaperLayout() const {

return CENTER_CROPPED;

}

-SkBitmap DesktopBackgroundController::GetCurrentWallpaperImage() {

+gfx::ImageSkia DesktopBackgroundController::GetCurrentWallpaperImage() {

if (desktop_background_mode_ != BACKGROUND_IMAGE)

- return SkBitmap();

+ return gfx::ImageSkia();

return GetWallpaper();

}