ash: Extract animator from PowerButtonController

ash/wm/power_button_controller.h

 // 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.
 
 #ifndef ASH_WM_POWER_BUTTON_CONTROLLER_H_
 #define ASH_WM_POWER_BUTTON_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
+#include "ash/wm/session_state_animator.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "ui/aura/root_window_observer.h"
 
 namespace gfx {
 class Rect;
 class Size;
 }
@@ skipping 15 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PowerButtonControllerDelegate);
 };
 
 // Displays onscreen animations and locks or suspends the system in response to
 // the power button being pressed or released.
 class ASH_EXPORT PowerButtonController : public aura::RootWindowObserver,
                                          public ShellObserver {
  public:
-  // Animations that can be applied to groups of containers.
-  // Exposed here for TestApi::ContainerGroupIsAnimated().
-  enum AnimationType {
-    ANIMATION_SLOW_CLOSE = 0,
-    ANIMATION_UNDO_SLOW_CLOSE,
-    ANIMATION_FAST_CLOSE,
-    ANIMATION_FADE_IN,
-    ANIMATION_HIDE,
-    ANIMATION_RESTORE,
-  };
-
-  // Groups of containers that can be animated.
-  // Exposed here for TestApi::ContainerGroupIsAnimated().
-  enum ContainerGroup {
-    ALL_CONTAINERS = 0,
-    SCREEN_LOCKER_CONTAINERS,
-    SCREEN_LOCKER_AND_RELATED_CONTAINERS,
-    ALL_BUT_SCREEN_LOCKER_AND_RELATED_CONTAINERS,
-  };
-
   // Helper class used by tests to access internal state.
   class ASH_EXPORT TestApi {
    public:
     explicit TestApi(PowerButtonController* controller)
-        : controller_(controller) {}
+        : controller_(controller),
+          animator_api_(new SessionStateAnimator::TestApi(
+                            controller->animator_)) {}
+    virtual ~TestApi() {
+      delete animator_api_;
+    }
 
     bool lock_timer_is_running() const {
       return controller_->lock_timer_.IsRunning();
     }
     bool lock_fail_timer_is_running() const {
       return controller_->lock_fail_timer_.IsRunning();
     }
     bool lock_to_shutdown_timer_is_running() const {
       return controller_->lock_to_shutdown_timer_.IsRunning();
     }
     bool shutdown_timer_is_running() const {
       return controller_->shutdown_timer_.IsRunning();
     }
     bool real_shutdown_timer_is_running() const {
       return controller_->real_shutdown_timer_.IsRunning();
     }
     bool hide_background_layer_timer_is_running() const {
-      return controller_->hide_background_layer_timer_.IsRunning();
+      return animator_api_->hide_background_layer_timer_is_running();
     }
 
     void trigger_lock_timeout() {
       controller_->OnLockTimeout();
       controller_->lock_timer_.Stop();
     }
     void trigger_lock_fail_timeout() {
       controller_->OnLockFailTimeout();
       controller_->lock_fail_timer_.Stop();
     }
     void trigger_lock_to_shutdown_timeout() {
       controller_->OnLockToShutdownTimeout();
       controller_->lock_to_shutdown_timer_.Stop();
     }
     void trigger_shutdown_timeout() {
       controller_->OnShutdownTimeout();
       controller_->shutdown_timer_.Stop();
     }
     void trigger_real_shutdown_timeout() {
       controller_->OnRealShutdownTimeout();
       controller_->real_shutdown_timer_.Stop();
     }
     void trigger_hide_background_layer_timeout() {
-      controller_->HideBackgroundLayer();
-      controller_->hide_background_layer_timer_.Stop();
+      animator_api_->trigger_hide_background_layer_timeout();
     }
 
     // Returns true if the given set of containers was last animated with
     // |type| (probably; the analysis is fairly ad-hoc).
-    bool ContainerGroupIsAnimated(ContainerGroup group,
-                                  AnimationType type) const;
+    bool ContainerGroupIsAnimated(
+        SessionStateAnimator::ContainerGroup group,
+        SessionStateAnimator::AnimationType type) const {
+      return animator_api_->ContainerGroupIsAnimated(group, type);
+    }
 
     // Returns true if |background_layer_| is non-NULL and visible.
-    bool BackgroundLayerIsVisible() const;
+    bool BackgroundLayerIsVisible() const {
+      return animator_api_->BackgroundLayerIsVisible();
+    }
 
     // Returns |background_layer_|'s bounds, or an empty rect if the layer is
     // NULL.
-    gfx::Rect GetBackgroundLayerBounds() const;
+    gfx::Rect GetBackgroundLayerBounds() const {
+      return animator_api_->GetBackgroundLayerBounds();
+    }
 
    private:
     PowerButtonController* controller_;  // not owned
+    SessionStateAnimator::TestApi* animator_api_;  // owned

[Daniel Erat, 2012/08/31 17:02:12]

any reason not to use scoped_ptr instead?

[Denis Kuznetsov (DE-MUC), 2012/09/28 11:52:43]

Done.

 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
   PowerButtonController();
   virtual ~PowerButtonController();
 
   void set_delegate(PowerButtonControllerDelegate* delegate) {
     delegate_.reset(delegate);
   }
 
   void set_has_legacy_power_button_for_test(bool legacy) {
     has_legacy_power_button_ = legacy;
   }
 
   // Called when the current screen brightness changes.
   void OnScreenBrightnessChanged(double percent);
 
   // Called when Chrome gets a request to display the lock screen.
   void OnStartingLock();
 
   // Called when the power or lock buttons are pressed or released.
   void OnPowerButtonEvent(bool down, const base::TimeTicks& timestamp);
   void OnLockButtonEvent(bool down, const base::TimeTicks& timestamp);
 
   // Displays the shutdown animation and requests shutdown when it's done.
   void RequestShutdown();
 
   // aura::RootWindowObserver overrides:
-  virtual void OnRootWindowResized(const aura::RootWindow* root,
-                                   const gfx::Size& old_size) OVERRIDE;
   virtual void OnRootWindowHostCloseRequested(
                                    const aura::RootWindow* root) OVERRIDE;
 
   // ShellObserver overrides:
   virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE;
   virtual void OnAppTerminating() OVERRIDE;
   virtual void OnLockStateChanged(bool locked) OVERRIDE;
 
  private:
   bool LoggedInAsNonGuest() const;
@@ skipping 13 matching lines @@
   // Requests that the machine be shut down.
   void OnRealShutdownTimeout();
 
   // Puts us into the pre-lock or pre-shutdown state.
   void StartLockTimer();
   void StartShutdownTimer();
 
   // Displays the shutdown animation and starts |real_shutdown_timer_|.
   void StartShutdownAnimationAndRequestShutdown();
 
-  // Shows or hides |background_layer_|.  The show method creates and
-  // initializes the layer if it doesn't already exist.
-  void ShowBackgroundLayer();
-  void HideBackgroundLayer();
-
   scoped_ptr<PowerButtonControllerDelegate> delegate_;
 
   // The current login status.
   user::LoginStatus login_status_;
 
   // Original login status during locked.  LOGGED_IN_NONE if it's not locked.
   user::LoginStatus unlocked_login_status_;
 
   // Are the power or lock buttons currently held?
   bool power_button_down_;
   bool lock_button_down_;
 
   // Is the screen currently turned off?
   bool screen_is_off_;
 
   // Are we in the process of shutting the machine down?
   bool shutting_down_;
 
   // Should we start |shutdown_timer_| when we receive notification that the
   // screen has been locked?
   bool should_start_shutdown_timer_after_lock_;
 
   // Was a command-line switch set telling us that we're running on hardware
   // that misreports power button releases?
   bool has_legacy_power_button_;
 
-  // Layer that's stacked under all of the root window's children to provide a
-  // black background when we're scaling all of the other windows down.
-  // TODO(derat): Remove this in favor of having the compositor only clear the
-  // viewport when there are regions not covered by a layer:
-  // http://crbug.com/113445
-  scoped_ptr<ui::Layer> background_layer_;
-
   // Started when the user first presses the power button while in a
   // logged-in-as-a-non-guest-user, unlocked state.  When it fires, we lock the
   // screen.
   base::OneShotTimer<PowerButtonController> lock_timer_;
 
   // Started when we request that the screen be locked.  When it fires, we
   // assume that our request got dropped.
   base::OneShotTimer<PowerButtonController> lock_fail_timer_;
 
   // Started when the screen is locked while the power button is held.  Adds a
   // delay between the appearance of the lock screen and the beginning of the
   // pre-shutdown animation.
   base::OneShotTimer<PowerButtonController> lock_to_shutdown_timer_;
 
   // Started when we begin displaying the pre-shutdown animation.  When it
   // fires, we start the shutdown animation and get ready to request shutdown.
   base::OneShotTimer<PowerButtonController> shutdown_timer_;
 
   // Started when we display the shutdown animation.  When it fires, we actually
   // request shutdown.  Gives the animation time to complete before Chrome, X,
   // etc. are shut down.
   base::OneShotTimer<PowerButtonController> real_shutdown_timer_;
 
-  // Started when we abort the pre-lock state.  When it fires, we hide
-  // |background_layer_|, as the desktop background is now covering the whole
-  // screen.
-  base::OneShotTimer<PowerButtonController> hide_background_layer_timer_;
+  SessionStateAnimator* animator_;

[Daniel Erat, 2012/08/31 17:02:12]

use scoped_ptr.  in general, please use it every time you have an opportunity to

[Denis Kuznetsov (DE-MUC), 2012/09/28 11:52:43]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(PowerButtonController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_POWER_BUTTON_CONTROLLER_H_