Add new animations in second implementation.

ash/wm/session_state_controller_impl2.cc

Index: ash/wm/session_state_controller_impl2.cc
diff --git a/ash/wm/session_state_controller_impl2.cc b/ash/wm/session_state_controller_impl2.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e6d5137bcd4396d3353e75f148956246699d6d20
--- /dev/null
+++ b/ash/wm/session_state_controller_impl2.cc
@@ -0,0 +1,288 @@
+// 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"

[Daniel Erat, 2012/10/22 17:45:48]

i didn't review this yet.  do you mind moving it to a second changelist, so
you're just refactoring the existing code in the first change and adding the new
implementation in the second?

+
+#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 {
+
+SessionStateControllerImpl2::TestApi::TestApi(
+    SessionStateControllerImpl2* controller)
+    : controller_(controller) {
+}
+
+SessionStateControllerImpl2::TestApi::~TestApi() {
+}
+
+SessionStateControllerImpl2::SessionStateControllerImpl2()
+    : login_status_(user::LOGGED_IN_NONE),
+      system_is_locked_(false),
+      shutting_down_(false),
+      shutdown_after_lock_(false) {
+  Shell::GetPrimaryRootWindow()->AddRootWindowObserver(this);
+}
+
+SessionStateControllerImpl2::~SessionStateControllerImpl2() {
+  Shell::GetPrimaryRootWindow()->RemoveRootWindowObserver(this);
+}
+
+void SessionStateControllerImpl2::OnLoginStateChanged(
+    user::LoginStatus status) {
+  if (status != user::LOGGED_IN_LOCKED)
+    login_status_ = status;
+  system_is_locked_ = (status == user::LOGGED_IN_LOCKED);
+}
+
+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_->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_PUT_DOWN);
+    lock_timer_.Stop();
+    lock_fail_timer_.Stop();
+
+    if (shutdown_after_lock_) {
+      shutdown_after_lock_ = false;
+      StartLockToShutdownTimer();
+    }
+  } else {
+    animator_->StartAnimation(
+        internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+        internal::SessionStateAnimator::ANIMATION_PUT_DOWN);
+  }
+}
+
+void SessionStateControllerImpl2::OnStartingLock() {
+  if (shutting_down_ || system_is_locked_)
+    return;
+
+  animator_->StartAnimation(
+      internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+      internal::SessionStateAnimator::ANIMATION_LIFT_UP);
+
+  // 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_->StartAnimation(
+      internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS |
+      internal::SessionStateAnimator::LAUNCHER,
+      internal::SessionStateAnimator::ANIMATION_LIFT_UP);
+  OnLockTimeout();
+}
+
+void SessionStateControllerImpl2::StartLockAnimation() {
+  shutdown_after_lock_ = true;
+
+  animator_->StartAnimation(
+      internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS |
+      internal::SessionStateAnimator::LAUNCHER,
+      internal::SessionStateAnimator::ANIMATION_LIFT_UP);
+  StartLockTimer();
+}
+
+void SessionStateControllerImpl2::StartShutdownAnimation() {
+  animator_->CreateForeground();
+  animator_->StartAnimation(
+      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_PUT_DOWN);
+  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);
+
+  pre_shutdown_timer_.Stop();
+}
+
+void SessionStateControllerImpl2::RequestShutdown() {
+  if (!shutting_down_)
+    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_->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 {
+  // TODO(mukai): think about kiosk mode.
+  return (login_status_ != user::LOGGED_IN_NONE) &&
+         (login_status_ != user::LOGGED_IN_GUEST);
+}
+
+void SessionStateControllerImpl2::StartLockTimer() {
+  lock_timer_.Stop();
+  lock_timer_.Start(FROM_HERE,
+                    base::TimeDelta::FromMilliseconds(kSlowCloseAnimMs),
+                    this, &SessionStateControllerImpl2::OnLockTimeout);
+}
+
+void SessionStateControllerImpl2::OnLockTimeout() {
+  delegate_->RequestLockScreen();
+  lock_fail_timer_.Start(
+      FROM_HERE,
+      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_PUT_DOWN);
+}
+
+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);
+}
+
+
+void SessionStateControllerImpl2::OnLockToShutdownTimeout() {
+  DCHECK(system_is_locked_);
+  StartShutdownAnimation();
+}
+
+void SessionStateControllerImpl2::StartPreShutdownAnimationTimer() {
+  pre_shutdown_timer_.Stop();
+  pre_shutdown_timer_.Start(
+      FROM_HERE,
+      base::TimeDelta::FromMilliseconds(kShutdownTimeoutMs),
+      this, &SessionStateControllerImpl2::OnPreShutdownAnimationTimeout);
+}
+
+void SessionStateControllerImpl2::OnPreShutdownAnimationTimeout() {
+  if (!shutting_down_)
+    RequestShutdownImpl();
+}
+
+void SessionStateControllerImpl2::StartRealShutdownTimer() {
+  real_shutdown_timer_.Start(
+      FROM_HERE,
+      base::TimeDelta::FromMilliseconds(kFastCloseAnimMs +
+          kShutdownRequestDelayMs),
+      this, &SessionStateControllerImpl2::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