Few lock screen animation corrections.

As Lock screen "launcher" panel is a part of WebUI and is animated together, we animate usual launcher too.

BUG=138171


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

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

1 files changed, 6 insertions, 4 deletions

diff --git a/ash/wm/session_state_controller_impl2.cc b/ash/wm/session_state_controller_impl2.cc
index a1e2ef8..3cb208a 100644
--- a/ash/wm/session_state_controller_impl2.cc
+++ b/ash/wm/session_state_controller_impl2.cc
@@ -69,7 +69,7 @@ void SessionStateControllerImpl2::OnLockStateChanged(bool locked) {
   if (locked) {
     animator_->StartAnimation(
         internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
-        internal::SessionStateAnimator::ANIMATION_FADE_IN);
+        internal::SessionStateAnimator::ANIMATION_LOWER);
     lock_timer_.Stop();
     lock_fail_timer_.Stop();
 
@@ -79,7 +79,8 @@ void SessionStateControllerImpl2::OnLockStateChanged(bool locked) {
     }
   } else {
     animator_->StartAnimation(
-        internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+        internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS |
+        internal::SessionStateAnimator::LAUNCHER,
         internal::SessionStateAnimator::ANIMATION_LOWER);
   }
 }
@@ -89,10 +90,11 @@ void SessionStateControllerImpl2::OnStartingLock() {
     return;
 
   animator_->StartAnimation(
-      internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+      internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS |
+      internal::SessionStateAnimator::LAUNCHER,
       internal::SessionStateAnimator::ANIMATION_RAISE);
 
-  // Hide the screen locker containers so we can make them fade in later.
+  // Hide the screen locker containers so we can raise them later.
   animator_->StartAnimation(
       internal::SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
       internal::SessionStateAnimator::ANIMATION_HIDE);