Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui…

ash/desktop_background/desktop_background_view.h

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..f1f765272d3d3f28ae95292ca7e4a2f179e4fda8 100644
--- a/ash/desktop_background/desktop_background_view.h
+++ b/ash/desktop_background/desktop_background_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -15,9 +15,14 @@ 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 DesktopBackgroundController::
+  // OnDesktopBackgroundChanged.
+  void SetWallpaper(const SkBitmap& wallpaper);
+
  private:
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;