Index: cc/test/animation_test_common.h |
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h |
index bd680d66587831d4bb53c991b4d0c8af4f219728..1ee89da9e9b8e3a8fe4327561904357d3f27ec31 100644 |
--- a/cc/test/animation_test_common.h |
+++ b/cc/test/animation_test_common.h |
@@ -26,9 +26,9 @@ class FakeFloatAnimationCurve : public FloatAnimationCurve { |
explicit FakeFloatAnimationCurve(double duration); |
virtual ~FakeFloatAnimationCurve(); |
- virtual double Duration() const OVERRIDE; |
- virtual float GetValue(double now) const OVERRIDE; |
- virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; |
+ virtual double Duration() const override; |
+ virtual float GetValue(double now) const override; |
+ virtual scoped_ptr<AnimationCurve> Clone() const override; |
private: |
double duration_; |
@@ -39,15 +39,15 @@ class FakeTransformTransition : public TransformAnimationCurve { |
explicit FakeTransformTransition(double duration); |
virtual ~FakeTransformTransition(); |
- virtual double Duration() const OVERRIDE; |
- virtual gfx::Transform GetValue(double time) const OVERRIDE; |
+ virtual double Duration() const override; |
+ virtual gfx::Transform GetValue(double time) const override; |
virtual bool AnimatedBoundsForBox(const gfx::BoxF& box, |
- gfx::BoxF* bounds) const OVERRIDE; |
- virtual bool AffectsScale() const OVERRIDE; |
- virtual bool IsTranslation() const OVERRIDE; |
- virtual bool MaximumScale(float* max_scale) const OVERRIDE; |
+ gfx::BoxF* bounds) const override; |
+ virtual bool AffectsScale() const override; |
+ virtual bool IsTranslation() const override; |
+ virtual bool MaximumScale(float* max_scale) const override; |
- virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; |
+ virtual scoped_ptr<AnimationCurve> Clone() const override; |
private: |
double duration_; |
@@ -58,10 +58,10 @@ class FakeFloatTransition : public FloatAnimationCurve { |
FakeFloatTransition(double duration, float from, float to); |
virtual ~FakeFloatTransition(); |
- virtual double Duration() const OVERRIDE; |
- virtual float GetValue(double time) const OVERRIDE; |
+ virtual double Duration() const override; |
+ virtual float GetValue(double time) const override; |
- virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; |
+ virtual scoped_ptr<AnimationCurve> Clone() const override; |
private: |
double duration_; |
@@ -75,13 +75,13 @@ class FakeLayerAnimationValueObserver : public LayerAnimationValueObserver { |
virtual ~FakeLayerAnimationValueObserver(); |
// LayerAnimationValueObserver implementation |
- virtual void OnFilterAnimated(const FilterOperations& filters) OVERRIDE; |
- virtual void OnOpacityAnimated(float opacity) OVERRIDE; |
- virtual void OnTransformAnimated(const gfx::Transform& transform) OVERRIDE; |
+ virtual void OnFilterAnimated(const FilterOperations& filters) override; |
+ virtual void OnOpacityAnimated(float opacity) override; |
+ virtual void OnTransformAnimated(const gfx::Transform& transform) override; |
virtual void OnScrollOffsetAnimated( |
- const gfx::ScrollOffset& scroll_offset) OVERRIDE; |
- virtual void OnAnimationWaitingForDeletion() OVERRIDE; |
- virtual bool IsActive() const OVERRIDE; |
+ const gfx::ScrollOffset& scroll_offset) override; |
+ virtual void OnAnimationWaitingForDeletion() override; |
+ virtual bool IsActive() const override; |
const FilterOperations& filters() const { return filters_; } |
float opacity() const { return opacity_; } |
@@ -103,12 +103,12 @@ class FakeLayerAnimationValueObserver : public LayerAnimationValueObserver { |
class FakeInactiveLayerAnimationValueObserver |
: public FakeLayerAnimationValueObserver { |
public: |
- virtual bool IsActive() const OVERRIDE; |
+ virtual bool IsActive() const override; |
}; |
class FakeLayerAnimationValueProvider : public LayerAnimationValueProvider { |
public: |
- virtual gfx::ScrollOffset ScrollOffsetForAnimation() const OVERRIDE; |
+ virtual gfx::ScrollOffset ScrollOffsetForAnimation() const override; |
void set_scroll_offset(const gfx::ScrollOffset& scroll_offset) { |
scroll_offset_ = scroll_offset; |