Restore to user selected wallpaper after browser crash

ash/shell.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/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 211 matching lines @@
       internal::kShellWindowId_SettingBubbleContainer,
       "SettingBubbleContainer",
       lock_screen_related_containers);
   SetChildWindowVisibilityChangesAnimated(settings_bubble_container);
 
   CreateContainer(internal::kShellWindowId_OverlayContainer,
                   "OverlayContainer",
                   lock_screen_related_containers);
 }
 
+// This dummy class is used for shell unit tests. We dont have chrome delegate
+// in these tests.
+class DummyUserWallpaperDelegate: public UserWallpaperDelegate {
+ public:
+  DummyUserWallpaperDelegate() {}
+
+  virtual ~DummyUserWallpaperDelegate() {}
+
+  const int GetUserWallpaperIndex() {
+    return 0;
+  }
+
+ private:
+   DISALLOW_COPY_AND_ASSIGN(DummyUserWallpaperDelegate);
+};
+
 class DummySystemTrayDelegate : public SystemTrayDelegate {
  public:
   DummySystemTrayDelegate()
       : muted_(false),
         wifi_enabled_(true),
         cellular_enabled_(true),
         bluetooth_enabled_(true),
         volume_(0.5) {
   }
 
@@ skipping 389 matching lines @@
     tray_->AddTrayItem(new internal::TraySettings());
     tray_->AddTrayItem(tray_date);
     tray_->AddTrayItem(tray_accessibility);
     tray_->AddTrayItem(tray_caps_lock);
   }
   if (!status_widget_)
     status_widget_ = internal::CreateStatusArea(tray_.get());
 
   // This controller needs to be set before SetupManagedWindowMode.
   desktop_background_controller_.reset(new DesktopBackgroundController);
+  if (delegate_.get())
+    user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
+  if (!user_wallpaper_delegate_.get())
+    user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate());
 
   InitLayoutManagers();
 
   if (!command_line->HasSwitch(switches::kAuraNoShadows)) {
     resize_shadow_controller_.reset(new internal::ResizeShadowController());
     shadow_controller_.reset(new internal::ShadowController());
   }
 
   focus_cycler_.reset(new internal::FocusCycler());
   focus_cycler_->AddWidget(status_widget_);
@@ skipping 140 matching lines @@
   GetContainer(internal::kShellWindowId_StatusContainer)->
       SetLayoutManager(status_area_layout_manager);
 
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   // Workspace manager has its own layout managers.
   workspace_controller_.reset(
       new internal::WorkspaceController(default_container));
   workspace_controller_->workspace_manager()->set_shelf(shelf_layout_manager);
 
-  // Create the desktop background image.
-  desktop_background_controller_->SetDefaultDesktopBackgroundImage();
+  // Create desktop background widget.
+  // TODO(bshe): We should be able to use OnDesktopBackgroundChanged function
+  // here after issue 117244 got fixed.
+  desktop_background_controller_->SetDesktopBackgroundImageMode(
+      GetWallpaper(user_wallpaper_delegate_->GetUserWallpaperIndex()));
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash