Improve existing lock transition - remove black splash.

ash/wm/power_button_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/wm/power_button_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 146 matching lines @@
 void RestoreWindow(aura::Window* window) {
   window->layer()->SetTransform(ui::Transform());
   window->layer()->SetOpacity(1.0);
 }
 
 // Fills |containers| with the containers described by |group|.
 void GetContainers(PowerButtonController::ContainerGroup group,
                    aura::Window::Windows* containers) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
+  aura::Window* wallpaper_container = Shell::GetContainer(
+      root_window,
+      internal::kShellWindowId_DesktopBackgroundContainer);
+  aura::Window* lock_wallpaper_container = Shell::GetContainer(
+      root_window,
+      internal::kShellWindowId_LockScreenBackgroundContainer);
+
   aura::Window* non_lock_screen_containers = Shell::GetContainer(
       root_window,
       internal::kShellWindowId_NonLockScreenContainersContainer);
   aura::Window* lock_screen_containers = Shell::GetContainer(
       root_window,
       internal::kShellWindowId_LockScreenContainersContainer);
   aura::Window* lock_screen_related_containers = Shell::GetContainer(
       root_window,
       internal::kShellWindowId_LockScreenRelatedContainersContainer);
 
   containers->clear();
   switch (group) {
     case PowerButtonController::ALL_CONTAINERS:
+      containers->push_back(wallpaper_container);
       containers->push_back(non_lock_screen_containers);
+      containers->push_back(lock_wallpaper_container);
       containers->push_back(lock_screen_containers);
       containers->push_back(lock_screen_related_containers);
       break;
-    case PowerButtonController::SCREEN_LOCKER_CONTAINERS:
+    case PowerButtonController::SCREEN_LOCKER_CONTAINERS_EXCEPT_WALLPAPER:
       containers->push_back(lock_screen_containers);
       break;
     case PowerButtonController::SCREEN_LOCKER_AND_RELATED_CONTAINERS:
+      containers->push_back(lock_wallpaper_container);
       containers->push_back(lock_screen_containers);
       containers->push_back(lock_screen_related_containers);
       break;
     case PowerButtonController::ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS:
+      // Doesn't include wallpaper_container as it is now excluded from
+      // these animations (i.e. restore).
+      // New lock/shutdown transition may change that.
       containers->push_back(non_lock_screen_containers);
       break;
     default:
       NOTREACHED() << "Unhandled container group " << group;
   }
 }
 
 // Apply animation |type| to all containers described by |group|.
 void StartAnimation(PowerButtonController::ContainerGroup group,
                     PowerButtonController::AnimationType type) {
@@ skipping 124 matching lines @@
 
   if (!locked && login_status_ == user::LOGGED_IN_LOCKED) {
     login_status_ = unlocked_login_status_;
     unlocked_login_status_ = user::LOGGED_IN_NONE;
   } else {
     unlocked_login_status_ = login_status_;
     login_status_ = user::LOGGED_IN_LOCKED;
   }
 
   if (locked) {
-    StartAnimation(SCREEN_LOCKER_CONTAINERS, ANIMATION_FADE_IN);
+    StartAnimation(SCREEN_LOCKER_CONTAINERS_EXCEPT_WALLPAPER,
+                   ANIMATION_FADE_IN);
     lock_timer_.Stop();
     lock_fail_timer_.Stop();
 
     if (!has_legacy_power_button_ && power_button_down_) {
       lock_to_shutdown_timer_.Stop();
       lock_to_shutdown_timer_.Start(
           FROM_HERE,
           base::TimeDelta::FromMilliseconds(kLockToShutdownTimeoutMs),
           this, &PowerButtonController::OnLockToShutdownTimeout);
     }
@@ skipping 14 matching lines @@
 
   // Ensure that the background layer is visible -- if the screen was locked via
   // the wrench menu, we won't have already shown the background as part of the
   // slow-close animation.
   ShowBackgroundLayer();
 
   StartAnimation(ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS,
                  ANIMATION_FAST_CLOSE);
 
   // Hide the screen locker containers so we can make them fade in later.
-  StartAnimation(SCREEN_LOCKER_CONTAINERS, ANIMATION_HIDE);
+  StartAnimation(SCREEN_LOCKER_CONTAINERS_EXCEPT_WALLPAPER,
+                 ANIMATION_HIDE);
 }
 
 void PowerButtonController::OnPowerButtonEvent(
     bool down, const base::TimeTicks& timestamp) {
   power_button_down_ = down;
 
   if (shutting_down_)
     return;
 
   // Avoid starting the lock/shutdown sequence if the power button is pressed
@@ skipping 198 matching lines @@
     root_layer->StackAtBottom(background_layer_.get());
   }
   background_layer_->SetVisible(true);
 }
 
 void PowerButtonController::HideBackgroundLayer() {
   background_layer_.reset();
 }
 
 }  // namespace ash