Restore to user selected wallpaper after browser crash

ash/desktop_background/desktop_background_controller.h

Index: ash/desktop_background/desktop_background_controller.h
diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
index e6ef4354cfa9771a29f892b613be57b7e730a9a4..7ea56c39d68ad16b5b6ab4e470a29a1fa405d2c4 100644
--- a/ash/desktop_background/desktop_background_controller.h
+++ b/ash/desktop_background/desktop_background_controller.h
@@ -13,6 +13,14 @@ class SkBitmap;
 
 namespace ash {
 
+class UserWallpaperDelegate {
+ public:
+  virtual ~UserWallpaperDelegate() {}
+
+  // Gets the index of user selected wallpaper
+  virtual const int GetUserWallpaperIndex() = 0;
+};
+
 // A class to listen for login and desktop background change events and set the
 // corresponding default wallpaper in Aura shell.
 class ASH_EXPORT DesktopBackgroundController {
@@ -30,31 +38,18 @@ class ASH_EXPORT DesktopBackgroundController {
     return desktop_background_mode_;
   }
 
-  // Change the desktop background image to wallpaper with |index|.
-  void OnDesktopBackgroundChanged(int index);
+  // Change the desktop background image to user selected wallpaper.
+  void OnDesktopBackgroundChanged();
 
   // Sets the desktop background to image mode and create a new background
   // widget with |wallpaper|.
   void SetDesktopBackgroundImageMode(const SkBitmap& wallpaper);
 
-  // Sets the desktop background to image mode and create a new background
-  // widget with default wallpaper.
-  void SetDefaultDesktopBackgroundImage();
-
-  // Sets the desktop background to image mode and create a new background
-  // widget with previous selected wallpaper at run time.
-  void SetPreviousDesktopBackgroundImage();
-
   // Sets the desktop background to solid color mode and create a solid color
   // layout.
   void SetDesktopBackgroundSolidColorMode();
 
  private:
-  // We need to cache the previously used wallpaper index. So when users switch
-  // desktop background color mode at run time, we can directly switch back to
-  // the user selected wallpaper in image mode.
-  int previous_wallpaper_index_;
-
   // Can change at runtime.
   BackgroundMode desktop_background_mode_;