Add new animations in second implementation.

ash/wm/session_state_controller_impl2.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/session_state_controller_impl2.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 36 matching lines @@
 }
 
 void SessionStateControllerImpl2::OnAppTerminating() {
   // If we hear that Chrome is exiting but didn't request it ourselves, all we
   // can really hope for is that we'll have time to clear the screen.
   if (!shutting_down_) {
     shutting_down_ = true;
     Shell* shell = ash::Shell::GetInstance();
     shell->env_filter()->set_cursor_hidden_by_filter(false);
     shell->cursor_manager()->ShowCursor(false);
-    animator_->ShowBlackLayer();
     animator_->StartAnimation(
         internal::SessionStateAnimator::kAllContainersMask,
         internal::SessionStateAnimator::ANIMATION_HIDE);
   }
 }
 
 void SessionStateControllerImpl2::OnLockStateChanged(bool locked) {
   if (shutting_down_ || (IsLocked()) == locked)
     return;
 
   system_is_locked_ = locked;
 
   if (locked) {
     animator_->StartAnimation(
         internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
         internal::SessionStateAnimator::ANIMATION_FADE_IN);
     lock_timer_.Stop();
     lock_fail_timer_.Stop();
 
     if (shutdown_after_lock_) {
       shutdown_after_lock_ = false;
       StartLockToShutdownTimer();
     }
   } else {
     animator_->StartAnimation(
-        internal::SessionStateAnimator::DESKTOP_BACKGROUND |
-        internal::SessionStateAnimator::LAUNCHER |
         internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
-        internal::SessionStateAnimator::ANIMATION_RESTORE);
-    animator_->DropBlackLayer();
+        internal::SessionStateAnimator::ANIMATION_LOWER);
   }
 }
 
 void SessionStateControllerImpl2::OnStartingLock() {
   if (shutting_down_ || system_is_locked_)
     return;
 
-  // Ensure that the black layer is visible -- if the screen was locked via
-  // the wrench menu, we won't have already shown the black background
-  // as part of the slow-close animation.
-  animator_->ShowBlackLayer();
-
-  animator_->StartAnimation(
-      internal::SessionStateAnimator::LAUNCHER,
-      internal::SessionStateAnimator::ANIMATION_HIDE);
-
   animator_->StartAnimation(
       internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
-      internal::SessionStateAnimator::ANIMATION_FULL_CLOSE);
+      internal::SessionStateAnimator::ANIMATION_RAISE);
 
   // Hide the screen locker containers so we can make them fade in later.
   animator_->StartAnimation(
       internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
       internal::SessionStateAnimator::ANIMATION_HIDE);
 }
 
 void SessionStateControllerImpl2::StartLockAnimationAndLockImmediately() {
-  animator_->ShowBlackLayer();
   animator_->StartAnimation(
-      internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
-      internal::SessionStateAnimator::ANIMATION_PARTIAL_CLOSE);
+      internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS |
+      internal::SessionStateAnimator::LAUNCHER,
+      internal::SessionStateAnimator::ANIMATION_RAISE);
   OnLockTimeout();
 }
 
 void SessionStateControllerImpl2::StartLockAnimation(bool shutdown_after_lock) {
   shutdown_after_lock_ = shutdown_after_lock;
 
-  animator_->ShowBlackLayer();
   animator_->StartAnimation(
-      internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
-      internal::SessionStateAnimator::ANIMATION_PARTIAL_CLOSE);
+      internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS |
+      internal::SessionStateAnimator::LAUNCHER,
+      internal::SessionStateAnimator::ANIMATION_RAISE);
   StartLockTimer();
 }
 
 void SessionStateControllerImpl2::StartShutdownAnimation() {
-  animator_->ShowBlackLayer();
+  animator_->CreateForeground();
   animator_->StartAnimation(
-      internal::SessionStateAnimator::kAllContainersMask,
-      internal::SessionStateAnimator::ANIMATION_PARTIAL_CLOSE);
-
+      internal::SessionStateAnimator::LOCK_SCREEN_SYSTEM_FOREGROUND,
+      internal::SessionStateAnimator::ANIMATION_PARTIAL_FADE_IN);
   StartPreShutdownAnimationTimer();
 }
 
 bool SessionStateControllerImpl2::IsEligibleForLock() {
   return IsLoggedInAsNonGuest() && !IsLocked() && !LockRequested();
 }
 
 bool SessionStateControllerImpl2::IsLocked() {
   return system_is_locked_;
 }
 
 bool SessionStateControllerImpl2::LockRequested() {
   return lock_fail_timer_.IsRunning();
 }
 
 bool SessionStateControllerImpl2::ShutdownRequested() {
   return shutting_down_;
 }
 
 bool SessionStateControllerImpl2::CanCancelLockAnimation() {
   return lock_timer_.IsRunning();
 }
 
 void SessionStateControllerImpl2::CancelLockAnimation() {
   if (!CanCancelLockAnimation())
     return;
   shutdown_after_lock_ = false;
   animator_->StartAnimation(
       internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
-      internal::SessionStateAnimator::ANIMATION_UNDO_PARTIAL_CLOSE);
-  animator_->ScheduleDropBlackLayer();
+      internal::SessionStateAnimator::ANIMATION_LOWER);
   lock_timer_.Stop();
 }
 
 bool SessionStateControllerImpl2::CanCancelShutdownAnimation() {
   return pre_shutdown_timer_.IsRunning() ||
          shutdown_after_lock_ ||
          lock_to_shutdown_timer_.IsRunning();
 }
 
 void SessionStateControllerImpl2::CancelShutdownAnimation() {
   if (!CanCancelShutdownAnimation())
     return;
   if (lock_to_shutdown_timer_.IsRunning()) {
     lock_to_shutdown_timer_.Stop();
     return;
   }
   if (shutdown_after_lock_) {
     shutdown_after_lock_ = false;
     return;
   }
+  animator_->CreateForeground();
+  animator_->StartAnimation(
+      internal::SessionStateAnimator::LOCK_SCREEN_SYSTEM_FOREGROUND,
+      internal::SessionStateAnimator::ANIMATION_UNDO_PARTIAL_FADE_IN);
 
-  if (system_is_locked_) {
-    // If we've already started shutdown transition at lock screen
-    // desktop background needs to be restored immediately.
-    animator_->StartAnimation(
-        internal::SessionStateAnimator::DESKTOP_BACKGROUND,
-        internal::SessionStateAnimator::ANIMATION_RESTORE);
-    animator_->StartAnimation(
-        internal::SessionStateAnimator::kAllLockScreenContainersMask,
-        internal::SessionStateAnimator::ANIMATION_UNDO_PARTIAL_CLOSE);
-    animator_->ScheduleDropBlackLayer();
-  } else {
-    animator_->StartAnimation(
-        internal::SessionStateAnimator::kAllContainersMask,
-        internal::SessionStateAnimator::ANIMATION_UNDO_PARTIAL_CLOSE);
-    animator_->ScheduleDropBlackLayer();
-  }
   pre_shutdown_timer_.Stop();
 }
 
 void SessionStateControllerImpl2::RequestShutdown() {
   if (!shutting_down_)
-    animator_->ShowBlackLayer();
     RequestShutdownImpl();
 }
 
 void SessionStateControllerImpl2::RequestShutdownImpl() {
   DCHECK(!shutting_down_);
   shutting_down_ = true;
 
   Shell* shell = ash::Shell::GetInstance();
   shell->env_filter()->set_cursor_hidden_by_filter(false);
   shell->cursor_manager()->ShowCursor(false);
 
-  animator_->ShowBlackLayer();
-  if (login_status_ != user::LOGGED_IN_NONE) {
-    // Hide the other containers before starting the animation.
-    // ANIMATION_FULL_CLOSE will make the screen locker windows partially
-    // transparent, and we don't want the other windows to show through.
-    animator_->StartAnimation(
-        internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS |
-        internal::SessionStateAnimator::LAUNCHER,
-        internal::SessionStateAnimator::ANIMATION_HIDE);
-    animator_->StartAnimation(
-        internal::SessionStateAnimator::kAllLockScreenContainersMask,
-        internal::SessionStateAnimator::ANIMATION_FULL_CLOSE);
-  } else {
-    animator_->StartAnimation(
-        internal::SessionStateAnimator::kAllContainersMask,
-        internal::SessionStateAnimator::ANIMATION_FULL_CLOSE);
-  }
+  animator_->CreateForeground();
+  animator_->StartAnimation(
+      internal::SessionStateAnimator::LOCK_SCREEN_SYSTEM_FOREGROUND,
+      internal::SessionStateAnimator::ANIMATION_FULL_FADE_IN);
   StartRealShutdownTimer();
 }
 
 void SessionStateControllerImpl2::OnRootWindowHostCloseRequested(
                                                 const aura::RootWindow*) {
   if(Shell::GetInstance() && Shell::GetInstance()->delegate())
     Shell::GetInstance()->delegate()->Exit();
 }
 
 bool SessionStateControllerImpl2::IsLoggedInAsNonGuest() const {
@@ skipping 16 matching lines @@
       base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs),
       this, &SessionStateControllerImpl2::OnLockFailTimeout);
 }
 
 void SessionStateControllerImpl2::OnLockFailTimeout() {
   DCHECK(!system_is_locked_);
   // Undo lock animation.
   animator_->StartAnimation(
       internal::SessionStateAnimator::LAUNCHER |
       internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
-      internal::SessionStateAnimator::ANIMATION_RESTORE);
-  animator_->DropBlackLayer();
+      internal::SessionStateAnimator::ANIMATION_LOWER);
 }
 
 void SessionStateControllerImpl2::StartLockToShutdownTimer() {
   shutdown_after_lock_ = false;
   lock_to_shutdown_timer_.Stop();
   lock_to_shutdown_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kLockToShutdownTimeoutMs),
       this, &SessionStateControllerImpl2::OnLockToShutdownTimeout);
 }
@@ skipping 33 matching lines @@
     if (delegate) {
       delegate->Exit();
       return;
     }
   }
 #endif
   delegate_->RequestShutdown();
 }
 
 }  // namespace ash