Restore to user selected wallpaper after browser crash

ash/desktop_background/desktop_background_controller.cc

Index: ash/desktop_background/desktop_background_controller.cc
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index cc4e017179742f972520b9ba361e3e3c960803ca..5d23e5dcd2fc0ba87259b2a31714afdb892ab492 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -21,7 +21,6 @@
 namespace ash {
 
 DesktopBackgroundController::DesktopBackgroundController() :
-  previous_wallpaper_index_(GetDefaultWallpaperIndex()),
   desktop_background_mode_(BACKGROUND_IMAGE) {
 }
 
@@ -38,7 +37,12 @@ void DesktopBackgroundController::OnDesktopBackgroundChanged(int index) {
   static_cast<internal::DesktopBackgroundView*>(
       root_window_layout->background_widget()->widget_delegate())->
           SetWallpaper(GetWallpaper(index));
-  previous_wallpaper_index_ = index;
+}
+
+void DesktopBackgroundController::OnUserLoginOrSwitchToImageMode() {

[flackr, 2012/03/21 17:44:20]

Rather than adding this method, how about changing OnDesktopBackgroundChanged to
not take an index and just get the user wallpaper index. Then you can use one
method for updating the visible background in all cases.

[bshe, 2012/03/22 02:16:03]

Done.

On 2012/03/21 17:44:20, flackr wrote:
Done.

+  int index = Shell::GetInstance()->user_wallpaper_delegate()->
+      GetUserWallpaperIndex();
+  OnDesktopBackgroundChanged(index);
 }
 
 void DesktopBackgroundController::SetDesktopBackgroundImageMode(
@@ -51,14 +55,6 @@ void DesktopBackgroundController::SetDesktopBackgroundImageMode(
   desktop_background_mode_ = BACKGROUND_IMAGE;
 }
 
-void DesktopBackgroundController::SetDefaultDesktopBackgroundImage() {
-  SetDesktopBackgroundImageMode(GetWallpaper(GetDefaultWallpaperIndex()));
-}
-
-void DesktopBackgroundController::SetPreviousDesktopBackgroundImage() {
-  SetDesktopBackgroundImageMode(GetWallpaper(previous_wallpaper_index_));
-}
-
 void DesktopBackgroundController::SetDesktopBackgroundSolidColorMode() {
   // Set a solid black background.
   // TODO(derat): Remove this in favor of having the compositor only clear the