| Index: ash/test/test_session_state_animator.h
|
| diff --git a/ash/test/test_session_state_animator.h b/ash/test/test_session_state_animator.h
|
| index 83ce1017c756f901ba8088b3519f385e86d97ab2..566af40e163cc746b9871216c39340730dbe9290 100644
|
| --- a/ash/test/test_session_state_animator.h
|
| +++ b/ash/test/test_session_state_animator.h
|
| @@ -29,9 +29,7 @@ class TestSessionStateAnimator : public SessionStateAnimator {
|
| TestSessionStateAnimator();
|
| ~TestSessionStateAnimator() override;
|
|
|
| - int last_animation_epoch() {
|
| - return last_animation_epoch_;
|
| - }
|
| + int last_animation_epoch() { return last_animation_epoch_; }
|
|
|
| // Resets the current animation epoch back to 0 and aborts all currently
|
| // active animations.
|
| @@ -85,14 +83,13 @@ class TestSessionStateAnimator : public SessionStateAnimator {
|
| // Data structure to track the currently active animations and their
|
| // callbacks.
|
| struct ActiveAnimation {
|
| - ActiveAnimation(
|
| - int animation_epoch,
|
| - base::TimeDelta duration,
|
| - SessionStateAnimator::Container container,
|
| - AnimationType type,
|
| - AnimationSpeed speed,
|
| - base::Closure success_callback,
|
| - base::Closure failed_callback);
|
| + ActiveAnimation(int animation_epoch,
|
| + base::TimeDelta duration,
|
| + SessionStateAnimator::Container container,
|
| + AnimationType type,
|
| + AnimationSpeed speed,
|
| + base::Closure success_callback,
|
| + base::Closure failed_callback);
|
| ActiveAnimation(const ActiveAnimation& other);
|
| virtual ~ActiveAnimation();
|
|
|
| @@ -124,11 +121,10 @@ class TestSessionStateAnimator : public SessionStateAnimator {
|
|
|
| // Starts an animation in the |animation_sequence| for each container
|
| // specified by |container_mask| with the given |type| and |speed|.
|
| - virtual void StartAnimationInSequence(
|
| - int container_mask,
|
| - AnimationType type,
|
| - AnimationSpeed speed,
|
| - AnimationSequence* animation_sequence);
|
| + virtual void StartAnimationInSequence(int container_mask,
|
| + AnimationType type,
|
| + AnimationSpeed speed,
|
| + AnimationSequence* animation_sequence);
|
|
|
| // Adds a single animation to the currently active animations. If an
|
| // animation is already active for the given |container| then it will be
|
|
|