Restore to user selected wallpaper after browser crash

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 395d2bf6a3582c00dc5f3b8be6ad74899a6472a1..669e04fd3a6d69b01a8716bad763c6265889ba00 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -598,6 +598,10 @@ void Shell::Init() {
 
   // This controller needs to be set before SetupManagedWindowMode.
   desktop_background_controller_.reset(new DesktopBackgroundController);
+  if (delegate_.get())
+    user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
+  desktop_background_controller_->SetDesktopBackgroundImageMode(
+      GetWallpaper(user_wallpaper_delegate_->GetUserWallpaperIndex()));

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

Seems this would be equivalent to:
desktop_background_controller_->OnUserLoginOrSwitchToImageMode(). Can we use
that?

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

Yes and no. Ideally, they should be equivalent. But since we have this issue
117244 not been fixed, we need to create the background widget when shell
initialize and only destroy it when shell got destroyed. So here, I need to use
SetDesktopBackgroundImageMode to initialized the background widget and only
update it in OnDesktopBackgroundChanged function.

 
   InitLayoutManagers();
 
@@ -752,9 +756,6 @@ void Shell::InitLayoutManagers() {
 
   // Ensure launcher is visible.
   launcher_->widget()->Show();
-
-  // Create the desktop background image.
-  desktop_background_controller_->SetDefaultDesktopBackgroundImage();
 }
 
 void Shell::DisableWorkspaceGridLayout() {