cros: Fix missing windows/launcher after resume/screen unlock

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/desktop_background/desktop_background_widget_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/threading/worker_pool.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/widget/widget.h"
 
+using ash::internal::DesktopBackgroundWidgetController;
+using ash::internal::kComponentWrapper;
+using ash::internal::kWindowDesktopComponent;
+
 namespace ash {
 namespace {
 
 const SkColor kTransparentColor = SkColorSetARGB(0x00, 0x00, 0x00, 0x00);
 
 internal::RootWindowLayoutManager* GetRootWindowLayoutManager(
     aura::RootWindow* root_window) {
   return static_cast<internal::RootWindowLayoutManager*>(
       root_window->layout_manager());
 }
@@ skipping 302 matching lines @@
   }
 }
 
 bool DesktopBackgroundController::ReparentBackgroundWidgets(int src_container,
                                                             int dst_container) {
   bool moved = false;
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   for (Shell::RootWindowList::iterator iter = root_windows.begin();
     iter != root_windows.end(); ++iter) {
     aura::RootWindow* root_window = *iter;
-    if (root_window->GetProperty(internal::kComponentWrapper)) {
-      internal::DesktopBackgroundWidgetController* component = root_window->
-          GetProperty(internal::kWindowDesktopComponent);
-      // Wallpaper animation may not finish at this point. Try to get component
-      // from kComponentWrapper instead.
-      if (!component) {
-        component = root_window->GetProperty(internal::kComponentWrapper)->
-            GetComponent(false);
-      }
-      DCHECK(component);
-      moved = moved || component->Reparent(root_window,
+    // In the steady state (no animation playing) the background widget
+    // controller exists in the kWindowDesktopComponent property.
+    DesktopBackgroundWidgetController* desktop_component = root_window->
+        GetProperty(kWindowDesktopComponent);
+    if (desktop_component) {
+      moved |= desktop_component->Reparent(root_window,
                                            src_container,
                                            dst_container);
     }
+    // During desktop show animations the controller lives in kComponentWrapper.
+    // NOTE: If a wallpaper load happens during a desktop show animation there
+    // can temporarily be two desktop background widgets.  We must reparent
+    // both of them - one above and one here.
+    DesktopBackgroundWidgetController* wrapped_component =
+        root_window->GetProperty(kComponentWrapper) ?
+        root_window->GetProperty(kComponentWrapper)->GetComponent(false) :
+        NULL;
+    if (wrapped_component) {
+      moved |= wrapped_component->Reparent(root_window,
+                                           src_container,
+                                           dst_container);
+    }
   }
   return moved;
 }
 
 int DesktopBackgroundController::GetBackgroundContainerId(bool locked) {
   return locked ? internal::kShellWindowId_LockScreenBackgroundContainer :
                   internal::kShellWindowId_DesktopBackgroundContainer;
 }
 
 }  // namespace ash