| Index: cc/layers/layer.h
|
| diff --git a/cc/layers/layer.h b/cc/layers/layer.h
|
| index a6271403432e052ae9905147e8d445f742db7341..3e83e8fcebcdbcfee28d03cf1c0c41923f9cb109 100644
|
| --- a/cc/layers/layer.h
|
| +++ b/cc/layers/layer.h
|
| @@ -552,16 +552,16 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
|
| void RemoveChildOrDependent(Layer* child);
|
|
|
| // LayerAnimationValueProvider implementation.
|
| - virtual gfx::ScrollOffset ScrollOffsetForAnimation() const OVERRIDE;
|
| + virtual gfx::ScrollOffset ScrollOffsetForAnimation() const override;
|
|
|
| // 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;
|
|
|
| // If this layer has a scroll parent, it removes |this| from its list of
|
| // scroll children.
|
|
|