Reload wallpaper when display configuration changes.

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 <string>
 
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 110 matching lines @@
 #include "ash/system/chromeos/power/power_status.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 
 namespace {
 
 using aura::Window;
 using views::Widget;
 
-// 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() {}
-
-  virtual int GetAnimationType() OVERRIDE {
-    return views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
-  }
-
-  virtual bool ShouldShowInitialAnimation() OVERRIDE {
-    return false;
-  }
-
-  virtual void UpdateWallpaper() OVERRIDE {
-  }
-
-  virtual void InitializeWallpaper() OVERRIDE {
-    ash::Shell::GetInstance()->desktop_background_controller()->
-        CreateEmptyWallpaper();
-  }
-
-  virtual void OpenSetWallpaperPage() OVERRIDE {
-  }
-
-  virtual bool CanOpenSetWallpaperPage() OVERRIDE {
-    return false;
-  }
-
-  virtual void OnWallpaperAnimationFinished() OVERRIDE {
-  }
-
-  virtual void OnWallpaperBootAnimationFinished() OVERRIDE {
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(DummyUserWallpaperDelegate);
-};
-
 // A Corewm VisibilityController subclass that calls the Ash animation routine
 // so we can pick up our extended animations. See ash/wm/window_animations.h.
 class AshVisibilityController : public views::corewm::VisibilityController {
  public:
   AshVisibilityController() {}
   virtual ~AshVisibilityController() {}
 
  private:
   // Overridden from views::corewm::VisibilityController:
   virtual bool CallAnimateOnChildWindowVisibilityChanged(
@@ skipping 120 matching lines @@
   visibility_controller_.reset();
   launcher_delegate_.reset();
   launcher_model_.reset();
   video_detector_.reset();
 
   power_button_controller_.reset();
   lock_state_controller_.reset();
   mru_window_tracker_.reset();
 
   resolution_notification_controller_.reset();
+  desktop_background_controller_.reset();
 
   // This also deletes all RootWindows. Note that we invoke Shutdown() on
   // DisplayController before resetting |display_controller_|, since destruction
   // of its owned RootWindowControllers relies on the value.
   display_controller_->Shutdown();
   display_controller_.reset();
   screen_position_controller_.reset();
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
    if (display_change_observer_)
@@ skipping 240 matching lines @@
 
   tooltip_controller_.reset(new views::corewm::TooltipController(
                                 gfx::SCREEN_TYPE_ALTERNATE));
   AddPreTargetHandler(tooltip_controller_.get());
 
   event_client_.reset(new internal::EventClientImpl);
 
   // This controller needs to be set before SetupManagedWindowMode.
   desktop_background_controller_.reset(new DesktopBackgroundController());
   user_wallpaper_delegate_.reset(delegate_->CreateUserWallpaperDelegate());
-  if (!user_wallpaper_delegate_)
-    user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate());
 
   // StatusAreaWidget uses Shell's CapsLockDelegate.
   caps_lock_delegate_.reset(delegate_->CreateCapsLockDelegate());
 
   session_state_delegate_.reset(delegate_->CreateSessionStateDelegate());
 
   if (!command_line->HasSwitch(views::corewm::switches::kNoDropShadows)) {
     resize_shadow_controller_.reset(new internal::ResizeShadowController());
     shadow_controller_.reset(
         new views::corewm::ShadowController(activation_client_));
@@ skipping 379 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash