| 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;
|
|
|