Load user custom wallpaper after browser crash.

ash/desktop_background/desktop_background_controller.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_controller.h"
 
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
@@ skipping 81 matching lines @@
       previous_index_(-1),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   DCHECK(root_window_);
 }
 
 DesktopBackgroundController::~DesktopBackgroundController() {
   CancelPendingWallpaperOperation();
 }
 
 void DesktopBackgroundController::SetDefaultWallpaper(int index) {
+  // We should not change background when index is invalid. For instance, at
+  // login screen or stub_user login.
+  if (index == ash::GetInvalidWallpaperIndex()) {
+    CreateEmptyWallpaper();
+    return;
+  }
+
   if (previous_index_ == index)
     return;
 
   CancelPendingWallpaperOperation();
 
   wallpaper_op_ = new WallpaperOperation(index);
   base::WorkerPool::PostTaskAndReply(
       FROM_HERE,
       base::Bind(&WallpaperOperation::Run, wallpaper_op_),
       base::Bind(&DesktopBackgroundController::OnWallpaperLoadCompleted,
@@ skipping 12 matching lines @@
 
 void DesktopBackgroundController::CancelPendingWallpaperOperation() {
   // Set canceled flag of previous request to skip unneeded loading.
   if (wallpaper_op_.get())
     wallpaper_op_->Cancel();
 
   // Cancel reply callback for previous request.
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
-void DesktopBackgroundController::SetLoggedInUserWallpaper() {
-  int index = Shell::GetInstance()->user_wallpaper_delegate()->
-      GetUserWallpaperIndex();
-  // We should not change background when index is invalid. For instance, at
-  // login screen or stub_user login.
-  if (index == ash::GetInvalidWallpaperIndex()) {
-    CreateEmptyWallpaper();
-    return;
-  }
-
-  SetDefaultWallpaper(index);
-}
-
 void DesktopBackgroundController::SetDesktopBackgroundSolidColorMode() {
   // Set a solid black background.
   // TODO(derat): Remove this in favor of having the compositor only clear the
   // viewport when there are regions not covered by a layer:
   // http://crbug.com/113445
   ui::Layer* background_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
   background_layer->SetColor(SK_ColorBLACK);
   root_window_->GetChildById(
       internal::kShellWindowId_DesktopBackgroundContainer)->
       layer()->Add(background_layer);
@@ skipping 22 matching lines @@
   wallpaper_op_ = NULL;
 }
 
 void DesktopBackgroundController::CreateEmptyWallpaper() {
   gfx::ImageSkia dummy;
   internal::CreateDesktopBackground(dummy, CENTER, root_window_);
   desktop_background_mode_ = BACKGROUND_IMAGE;
 }
 
 }  // namespace ash