ash : introduce second SessionStateController 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.h"
+#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"
 #include "ash/wm/session_state_animator.h"
 #include "base/command_line.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/shared/compound_event_filter.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
 #endif
 
 namespace ash {
 
-const int SessionStateController::kLockTimeoutMs = 400;
-const int SessionStateController::kShutdownTimeoutMs = 400;
-const int SessionStateController::kLockFailTimeoutMs = 4000;
-const int SessionStateController::kLockToShutdownTimeoutMs = 150;
-const int SessionStateController::kSlowCloseAnimMs = 400;
-const int SessionStateController::kUndoSlowCloseAnimMs = 100;
-const int SessionStateController::kFastCloseAnimMs = 150;
-const int SessionStateController::kShutdownRequestDelayMs = 50;
-
-SessionStateController::TestApi::TestApi(SessionStateController* controller)
+SessionStateControllerImpl2::TestApi::TestApi(
+    SessionStateControllerImpl2* controller)
     : controller_(controller) {
 }
 
-SessionStateController::TestApi::~TestApi() {
+SessionStateControllerImpl2::TestApi::~TestApi() {
 }
 
-SessionStateController::SessionStateController()
+SessionStateControllerImpl2::SessionStateControllerImpl2()
     : login_status_(user::LOGGED_IN_NONE),
-      unlocked_login_status_(user::LOGGED_IN_NONE),
+      system_is_locked_(false),
       shutting_down_(false),
-      shutdown_after_lock_(false),
-      animator_(new internal::SessionStateAnimator()) {
+      shutdown_after_lock_(false) {
   Shell::GetPrimaryRootWindow()->AddRootWindowObserver(this);
 }
 
-SessionStateController::~SessionStateController() {
+SessionStateControllerImpl2::~SessionStateControllerImpl2() {
   Shell::GetPrimaryRootWindow()->RemoveRootWindowObserver(this);
 }
 
-void SessionStateController::SetDelegate(
-    SessionStateControllerDelegate* delegate) {
-  delegate_.reset(delegate);
+void SessionStateControllerImpl2::OnLoginStateChanged(
+    user::LoginStatus status) {
+  if (status != user::LOGGED_IN_LOCKED)
+    login_status_ = status;
+  system_is_locked_ = (status == user::LOGGED_IN_LOCKED);
 }
 
-void SessionStateController::OnLoginStateChanged(user::LoginStatus status) {
-  login_status_ = status;
-  unlocked_login_status_ = user::LOGGED_IN_NONE;
-}
-
-void SessionStateController::OnAppTerminating() {
+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 SessionStateController::OnLockStateChanged(bool locked) {
+void SessionStateControllerImpl2::OnLockStateChanged(bool locked) {
   if (shutting_down_ || (IsLocked()) == locked)
     return;
 
-  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;
-  }
+  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();
   }
 }
 
-void SessionStateController::OnStartingLock() {
-  if (shutting_down_ || login_status_ == user::LOGGED_IN_LOCKED)
+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_FAST_CLOSE);
+      internal::SessionStateAnimator::ANIMATION_FULL_CLOSE);
 
   // 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 SessionStateController::StartLockAnimationAndLockImmediately() {
+void SessionStateControllerImpl2::StartLockAnimationAndLockImmediately() {
   animator_->ShowBlackLayer();
   animator_->StartAnimation(
       internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
-      internal::SessionStateAnimator::ANIMATION_SLOW_CLOSE);
+      internal::SessionStateAnimator::ANIMATION_PARTIAL_CLOSE);
   OnLockTimeout();
 }
 
-void SessionStateController::StartLockAnimation(bool shutdown_after_lock) {
+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_SLOW_CLOSE);
+      internal::SessionStateAnimator::ANIMATION_PARTIAL_CLOSE);
   StartLockTimer();
 }
 
-void SessionStateController::StartShutdownAnimation() {
+void SessionStateControllerImpl2::StartShutdownAnimation() {
   animator_->ShowBlackLayer();
   animator_->StartAnimation(
       internal::SessionStateAnimator::kAllContainersMask,
-      internal::SessionStateAnimator::ANIMATION_SLOW_CLOSE);
+      internal::SessionStateAnimator::ANIMATION_PARTIAL_CLOSE);
 
   StartPreShutdownAnimationTimer();
 }
 
-bool SessionStateController::IsEligibleForLock() {
+bool SessionStateControllerImpl2::IsEligibleForLock() {
   return IsLoggedInAsNonGuest() && !IsLocked() && !LockRequested();
 }
 
-bool SessionStateController::IsLocked() {
-  return login_status_ == user::LOGGED_IN_LOCKED;
+bool SessionStateControllerImpl2::IsLocked() {
+  return system_is_locked_;
 }
 
-bool SessionStateController::LockRequested() {
+bool SessionStateControllerImpl2::LockRequested() {
   return lock_fail_timer_.IsRunning();
 }
 
-bool SessionStateController::ShutdownRequested() {
+bool SessionStateControllerImpl2::ShutdownRequested() {
   return shutting_down_;
 }
 
-bool SessionStateController::CanCancelLockAnimation() {
+bool SessionStateControllerImpl2::CanCancelLockAnimation() {
   return lock_timer_.IsRunning();
 }
 
-void SessionStateController::CancelLockAnimation() {
-  if (!CanCancelLockAnimation())
-    return;
-  shutdown_after_lock_ = false;
-  animator_->StartAnimation(
-      internal::SessionStateAnimator::kAllContainersMask,
-      internal::SessionStateAnimator::ANIMATION_UNDO_SLOW_CLOSE);
-  animator_->ScheduleDropBlackLayer();
-  lock_timer_.Stop();
-}
-
-void SessionStateController::CancelLockWithOtherAnimation() {
+void SessionStateControllerImpl2::CancelLockAnimation() {
   if (!CanCancelLockAnimation())
     return;
   shutdown_after_lock_ = false;
   animator_->StartAnimation(
       internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
-      internal::SessionStateAnimator::ANIMATION_UNDO_SLOW_CLOSE);
+      internal::SessionStateAnimator::ANIMATION_UNDO_PARTIAL_CLOSE);
   animator_->ScheduleDropBlackLayer();
   lock_timer_.Stop();
 }
 
-bool SessionStateController::CanCancelShutdownAnimation() {
+bool SessionStateControllerImpl2::CanCancelShutdownAnimation() {
   return pre_shutdown_timer_.IsRunning() ||
          shutdown_after_lock_ ||
          lock_to_shutdown_timer_.IsRunning();
 }
 
-void SessionStateController::CancelShutdownAnimation() {
+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;
   }
 
-  if (login_status_ == user::LOGGED_IN_LOCKED) {
+  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_SLOW_CLOSE);
+        internal::SessionStateAnimator::ANIMATION_UNDO_PARTIAL_CLOSE);
     animator_->ScheduleDropBlackLayer();
   } else {
     animator_->StartAnimation(
         internal::SessionStateAnimator::kAllContainersMask,
-        internal::SessionStateAnimator::ANIMATION_UNDO_SLOW_CLOSE);
+        internal::SessionStateAnimator::ANIMATION_UNDO_PARTIAL_CLOSE);
     animator_->ScheduleDropBlackLayer();
   }
   pre_shutdown_timer_.Stop();
 }
 
-void SessionStateController::RequestShutdown() {
+void SessionStateControllerImpl2::RequestShutdown() {
   if (!shutting_down_)
     animator_->ShowBlackLayer();
     RequestShutdownImpl();
 }
 
-void SessionStateController::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_FAST_CLOSE will make the screen locker windows partially
+    // 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_FAST_CLOSE);
+        internal::SessionStateAnimator::ANIMATION_FULL_CLOSE);
   } else {
     animator_->StartAnimation(
         internal::SessionStateAnimator::kAllContainersMask,
-        internal::SessionStateAnimator::ANIMATION_FAST_CLOSE);
+        internal::SessionStateAnimator::ANIMATION_FULL_CLOSE);
   }
   StartRealShutdownTimer();
 }
 
-void SessionStateController::OnRootWindowHostCloseRequested(
+void SessionStateControllerImpl2::OnRootWindowHostCloseRequested(
                                                 const aura::RootWindow*) {
   if(Shell::GetInstance() && Shell::GetInstance()->delegate())
     Shell::GetInstance()->delegate()->Exit();
 }
 
-bool SessionStateController::IsLoggedInAsNonGuest() const {
+bool SessionStateControllerImpl2::IsLoggedInAsNonGuest() const {
   // TODO(mukai): think about kiosk mode.
   return (login_status_ != user::LOGGED_IN_NONE) &&
          (login_status_ != user::LOGGED_IN_GUEST);
 }
 
-void SessionStateController::StartLockTimer() {
+void SessionStateControllerImpl2::StartLockTimer() {
   lock_timer_.Stop();
   lock_timer_.Start(FROM_HERE,
                     base::TimeDelta::FromMilliseconds(kSlowCloseAnimMs),
-                    this, &SessionStateController::OnLockTimeout);
+                    this, &SessionStateControllerImpl2::OnLockTimeout);
 }
 
-void SessionStateController::OnLockTimeout() {
+void SessionStateControllerImpl2::OnLockTimeout() {
   delegate_->RequestLockScreen();
   lock_fail_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs),
-      this, &SessionStateController::OnLockFailTimeout);
+      this, &SessionStateControllerImpl2::OnLockFailTimeout);
 }
 
-void SessionStateController::OnLockFailTimeout() {
-  DCHECK_NE(login_status_, user::LOGGED_IN_LOCKED);
+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();
 }
 
-void SessionStateController::StartLockToShutdownTimer() {
+void SessionStateControllerImpl2::StartLockToShutdownTimer() {
   shutdown_after_lock_ = false;
   lock_to_shutdown_timer_.Stop();
   lock_to_shutdown_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kLockToShutdownTimeoutMs),
-      this, &SessionStateController::OnLockToShutdownTimeout);
+      this, &SessionStateControllerImpl2::OnLockToShutdownTimeout);
 }
 
 
-void SessionStateController::OnLockToShutdownTimeout() {
-  DCHECK_EQ(login_status_, user::LOGGED_IN_LOCKED);
+void SessionStateControllerImpl2::OnLockToShutdownTimeout() {
+  DCHECK(system_is_locked_);
   StartShutdownAnimation();
 }
 
-void SessionStateController::StartPreShutdownAnimationTimer() {
+void SessionStateControllerImpl2::StartPreShutdownAnimationTimer() {
   pre_shutdown_timer_.Stop();
   pre_shutdown_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kShutdownTimeoutMs),
-      this, &SessionStateController::OnPreShutdownAnimationTimeout);
+      this, &SessionStateControllerImpl2::OnPreShutdownAnimationTimeout);
 }
 
-void SessionStateController::OnPreShutdownAnimationTimeout() {
+void SessionStateControllerImpl2::OnPreShutdownAnimationTimeout() {
   if (!shutting_down_)
     RequestShutdownImpl();
 }
 
-void SessionStateController::StartRealShutdownTimer() {
+void SessionStateControllerImpl2::StartRealShutdownTimer() {
   real_shutdown_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kFastCloseAnimMs +
           kShutdownRequestDelayMs),
-      this, &SessionStateController::OnRealShutdownTimeout);
+      this, &SessionStateControllerImpl2::OnRealShutdownTimeout);
 }
 
-void SessionStateController::OnRealShutdownTimeout() {
+void SessionStateControllerImpl2::OnRealShutdownTimeout() {
   DCHECK(shutting_down_);
 #if defined(OS_CHROMEOS)
   if (!base::chromeos::IsRunningOnChromeOS()) {
     ShellDelegate* delegate = Shell::GetInstance()->delegate();
     if (delegate) {
       delegate->Exit();
       return;
     }
   }
 #endif
   delegate_->RequestShutdown();
 }
 
 }  // namespace ash