Index: ash/rotator/screen_rotation_animator.h |
diff --git a/ash/rotator/screen_rotation_animator.h b/ash/rotator/screen_rotation_animator.h |
index ac6f18a83569e0e1aeab745949ba9149bf5342fd..be25e67367e9c3fac82b3c22763dec0e9d59c4a8 100644 |
--- a/ash/rotator/screen_rotation_animator.h |
+++ b/ash/rotator/screen_rotation_animator.h |
@@ -49,13 +49,15 @@ class ASH_EXPORT ScreenRotationAnimator { |
void RemoveScreenRotationAnimatorObserver( |
ScreenRotationAnimatorObserver* observer); |
- void OnLayerAnimationEnded(); |
- |
- void OnLayerAnimationAborted(); |
+ // When screen rotation animation is ended or aborted, calls |Rotate()| with |
+ // the pending rotation request if the request queue is not empty. Otherwise |
+ // notifies |screen_rotation_animator_observer_|. |
+ void ProcessAnimationQueue(); |
private: |
friend class ash::test::ScreenRotationAnimatorTestApi; |
struct ScreenRotationRequest; |
+ class ScreenRotationAnimationMetricsReporter; |
// Set the screen orientation to |new_rotation| and animate the change. The |
// animation will rotate the initial orientation's layer towards the new |
@@ -64,11 +66,6 @@ class ASH_EXPORT ScreenRotationAnimator { |
// |rotation_degrees| arc. |
void AnimateRotation(std::unique_ptr<ScreenRotationRequest> rotation_request); |
- // When screen rotation animation is ended or aborted, if the request queue is |
- // not empty, it will call |Rotate()| with the pending rotation request. |
- // Otherwise it will notify |screen_rotation_animator_observer_|. |
- void ProcessAnimationQueue(); |
- |
void set_disable_animation_timers_for_test(bool disable_timers); |
void StopAnimating(); |
@@ -76,6 +73,7 @@ class ASH_EXPORT ScreenRotationAnimator { |
// The id of the display to rotate. |
int64_t display_id_; |
bool is_rotating_; |
+ std::unique_ptr<ScreenRotationAnimationMetricsReporter> metrics_reporter_; |
oshima
2017/03/24 22:46:00
nit: you can just use ui::AnimationMetricsReporter
wutao
2017/03/24 23:50:55
Good suggestion. Done and Thanks.
|
// Only set in unittest to disable animation timers. |
bool disable_animation_timers_for_test_; |
base::ObserverList<ScreenRotationAnimatorObserver> |