Reland - cros: Add CHECK for screen unlock problem

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/shell.h"
 #include "ash/shell_factory.h"
@@ skipping 219 matching lines @@
   for (Shell::RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     gfx::Size root_window_size = (*iter)->GetHostSize();
     if (root_window_size.width() > kSmallWallpaperMaxWidth ||
         root_window_size.height() > kSmallWallpaperMaxHeight)
       resolution = LARGE;
   }
   return resolution;
 }
 
-void DesktopBackgroundController::MoveDesktopToLockedContainer() {
+bool DesktopBackgroundController::MoveDesktopToLockedContainer() {
   if (locked_)
-    return;
+    return false;
   locked_ = true;
-  ReparentBackgroundWidgets(GetBackgroundContainerId(false),
-                            GetBackgroundContainerId(true));
+  return ReparentBackgroundWidgets(GetBackgroundContainerId(false),
+                                   GetBackgroundContainerId(true));
 }
 
-void DesktopBackgroundController::MoveDesktopToUnlockedContainer() {
+bool DesktopBackgroundController::MoveDesktopToUnlockedContainer() {
   if (!locked_)
-    return;
+    return false;
   locked_ = false;
-  ReparentBackgroundWidgets(GetBackgroundContainerId(true),
-                            GetBackgroundContainerId(false));
+  return ReparentBackgroundWidgets(GetBackgroundContainerId(true),
+                                   GetBackgroundContainerId(false));
 }
 
 void DesktopBackgroundController::OnWindowDestroying(aura::Window* window) {
   window->SetProperty(internal::kWindowDesktopComponent,
       static_cast<internal::DesktopBackgroundWidgetController*>(NULL));
   window->SetProperty(internal::kComponentWrapper,
       static_cast<internal::ComponentWrapper*>(NULL));
 }
 
 void DesktopBackgroundController::SetDesktopBackgroundImageMode() {
@@ skipping 65 matching lines @@
 }
 
 void DesktopBackgroundController::InstallComponentForAllWindows() {
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   for (Shell::RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     InstallComponent(*iter);
   }
 }
 
-void DesktopBackgroundController::ReparentBackgroundWidgets(int src_container,
+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);
-      component->Reparent(root_window,
-                          src_container,
-                          dst_container);
+      moved = moved || 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