| Index: ash/rotator/screen_rotation_animator.h
|
| diff --git a/ash/rotator/screen_rotation_animator.h b/ash/rotator/screen_rotation_animator.h
|
| index d57a85e7ae37db7139ae09261778dc074a2cecd8..179d0bea6c25b6a0280e0e1f6993779b4056f03b 100644
|
| --- a/ash/rotator/screen_rotation_animator.h
|
| +++ b/ash/rotator/screen_rotation_animator.h
|
| @@ -5,8 +5,10 @@
|
| #ifndef ASH_ROTATOR_SCREEN_ROTATION_ANIMATOR_H_
|
| #define ASH_ROTATOR_SCREEN_ROTATION_ANIMATOR_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include "ash/ash_export.h"
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "ui/gfx/display.h"
|
|
|
| namespace ash {
|
| @@ -14,7 +16,7 @@ namespace ash {
|
| // Utility to perform a screen rotation with an animation.
|
| class ASH_EXPORT ScreenRotationAnimator {
|
| public:
|
| - explicit ScreenRotationAnimator(int64 display_id);
|
| + explicit ScreenRotationAnimator(int64_t display_id);
|
| ~ScreenRotationAnimator();
|
|
|
| // Returns true if the screen rotation animation can be completed
|
| @@ -31,7 +33,7 @@ class ASH_EXPORT ScreenRotationAnimator {
|
|
|
| private:
|
| // The id of the display to rotate.
|
| - int64 display_id_;
|
| + int64_t display_id_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScreenRotationAnimator);
|
| };
|
|
|