ash/desktop_background/desktop_background_view.h - Issue 9580023: Enable user change background image in settings page in Aura build.

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_view.h

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Address reveiw and auto select the current wallpaper thumbnail when select wallpaper overlay shows. Created 8 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

« ash/desktop_background/desktop_background_resources.cc ('K') | « ash/desktop_background/desktop_background_resources.cc ('k') | ash/desktop_background/desktop_background_view.cc » ('j') | ash/shell.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/desktop_background/desktop_background_view.h

diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h

index 6af658325a6423f13ad9e61ed3b0852a91ba986c..7cd47fdecb07ecf1684254a181d8374d4d258293 100644

--- a/ash/desktop_background/desktop_background_view.h

+++ b/ash/desktop_background/desktop_background_view.h

@@ -15,9 +15,13 @@ namespace internal {

class DesktopBackgroundView : public views::WidgetDelegateView {

public:

- DesktopBackgroundView();

+ DesktopBackgroundView(const SkBitmap& wallpaper);

virtual ~DesktopBackgroundView();

+ // TODO(bshe): Remove this function once issue 117244 is fixed. It is

+ // currently used in Shell::SetDesktopBackgroundWallpaper.

+ void SetWallpaper(const SkBitmap& wallpaper);

private:

// Overridden from views::View:

virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;