Revert 151393 - Fix white flash when user signs out and fix wallpaper animation regression

When user signs out and transit to the login screen, the wallpaper fade in from a white screen. Described in 141563, this Cl fixed it.
Also, after user login, or switch users at login screen. when wallpaper change, the new wallpaper should fade in nicely. There is a regression in recent builds. This fix fixed the regression as well. 

BUG=141563, 141676, 142042

Review URL: https://chromiumcodereview.appspot.com/10827284

TBR=bshe@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10854136

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151398 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 6 deletions

diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc
index 1d0f5fa..6e6d799 100644
--- a/ash/desktop_background/desktop_background_widget_controller.cc
+++ b/ash/desktop_background/desktop_background_widget_controller.cc
@@ -8,14 +8,12 @@
 #include "ui/views/widget/widget.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::DesktopBackgroundWidgetController*);
-DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ComponentWrapper*);
 
 namespace ash {
 namespace internal {
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(DesktopBackgroundWidgetController,
                                  kWindowDesktopComponent, NULL);
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(ComponentWrapper, kComponentWrapper, NULL);
 
 DesktopBackgroundWidgetController::DesktopBackgroundWidgetController(
     views::Widget* widget) : widget_(widget) {
@@ -41,6 +39,7 @@ void DesktopBackgroundWidgetController::SetBounds(gfx::Rect bounds) {
     layer_->SetBounds(bounds);
 }
 
+
 void DesktopBackgroundWidgetController::Reparent(aura::RootWindow* root_window,
                                                  int src_container,
                                                  int dest_container) {
@@ -54,9 +53,5 @@ void DesktopBackgroundWidgetController::Reparent(aura::RootWindow* root_window,
   }
 }
 
-ComponentWrapper::ComponentWrapper(
-    DesktopBackgroundWidgetController* component) : component_(component) {
-}
-
 }  // namespace internal
 }  // namespace ash