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

ash/desktop_background/desktop_background_view.cc

 // 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.
 
 #include "ash/desktop_background/desktop_background_view.h"
 
 #include <limits>
 
 #include "ash/ash_export.h"
 #include "ash/shell.h"
@@ skipping 10 matching lines @@
 namespace internal {
 
 // For our scaling ratios we need to round positive numbers.
 static int RoundPositive(double x) {
   return static_cast<int>(floor(x + 0.5));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopBackgroundView, public:
 
-DesktopBackgroundView::DesktopBackgroundView() {
-  wallpaper_ = *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_AURA_WALLPAPER_1).ToSkBitmap();
+DesktopBackgroundView::DesktopBackgroundView(const SkBitmap& wallpaper) {
+  wallpaper_ = wallpaper;
   wallpaper_.buildMipMap(false);
 }
 
 DesktopBackgroundView::~DesktopBackgroundView() {
 }
 
+void DesktopBackgroundView::SetWallpaper(const SkBitmap& wallpaper) {
+  wallpaper_ = wallpaper;
+  wallpaper_.buildMipMap(false);
+  SchedulePaint();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopBackgroundView, views::View overrides:
 
 void DesktopBackgroundView::OnPaint(gfx::Canvas* canvas) {
   // Scale the image while maintaining the aspect ratio, cropping as
   // necessary to fill the background. Ideally the image should be larger
   // than the largest display supported, if not we will center it rather than
   // streching to avoid upsampling artifacts (Note that we could tile too, but
   // decided not to do this at the moment).
   gfx::Rect wallpaper_rect(0, 0, wallpaper_.width(), wallpaper_.height());
@@ skipping 31 matching lines @@
 
 bool DesktopBackgroundView::OnMousePressed(const views::MouseEvent& event) {
   return true;
 }
 
 void DesktopBackgroundView::OnMouseReleased(const views::MouseEvent& event) {
   if (event.IsRightMouseButton())
     Shell::GetInstance()->ShowBackgroundMenu(GetWidget(), event.location());
 }
 
-views::Widget* CreateDesktopBackground() {
+views::Widget* CreateDesktopBackground(const SkBitmap& wallpaper) {
   views::Widget* desktop_widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  DesktopBackgroundView* view = new DesktopBackgroundView;
+  DesktopBackgroundView* view = new DesktopBackgroundView(wallpaper);
   params.delegate = view;
   params.parent =
       Shell::GetInstance()->GetContainer(
           ash::internal::kShellWindowId_DesktopBackgroundContainer);
   desktop_widget->Init(params);
   desktop_widget->SetContentsView(view);
   desktop_widget->Show();
   desktop_widget->GetNativeView()->SetName("DesktopBackgroundView");
   return desktop_widget;
 }
 
 }  // namespace internal
 }  // namespace ash