Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Unified Diff: ui/gfx/interpolated_transform.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/image/image_skia_operations.cc ('k') | ui/gfx/mac/coordinate_conversion_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/interpolated_transform.h
diff --git a/ui/gfx/interpolated_transform.h b/ui/gfx/interpolated_transform.h
index dea9ce91fb3447f725b9e0e654d7de997e832e03..6b7d0aaa032c190a481c55330cd692a77afcd362 100644
--- a/ui/gfx/interpolated_transform.h
+++ b/ui/gfx/interpolated_transform.h
@@ -94,7 +94,7 @@ class GFX_EXPORT InterpolatedRotation : public InterpolatedTransform {
virtual ~InterpolatedRotation();
protected:
- virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
+ virtual gfx::Transform InterpolateButDoNotCompose(float t) const override;
private:
const float start_degrees_;
@@ -122,7 +122,7 @@ class GFX_EXPORT InterpolatedAxisAngleRotation : public InterpolatedTransform {
virtual ~InterpolatedAxisAngleRotation();
protected:
- virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
+ virtual gfx::Transform InterpolateButDoNotCompose(float t) const override;
private:
gfx::Vector3dF axis_;
@@ -152,7 +152,7 @@ class GFX_EXPORT InterpolatedScale : public InterpolatedTransform {
virtual ~InterpolatedScale();
protected:
- virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
+ virtual gfx::Transform InterpolateButDoNotCompose(float t) const override;
private:
const gfx::Point3F start_scale_;
@@ -172,7 +172,7 @@ class GFX_EXPORT InterpolatedTranslation : public InterpolatedTransform {
virtual ~InterpolatedTranslation();
protected:
- virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
+ virtual gfx::Transform InterpolateButDoNotCompose(float t) const override;
private:
const gfx::Point start_pos_;
@@ -196,7 +196,7 @@ class GFX_EXPORT InterpolatedConstantTransform : public InterpolatedTransform {
virtual ~InterpolatedConstantTransform();
protected:
- virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
+ virtual gfx::Transform InterpolateButDoNotCompose(float t) const override;
private:
const gfx::Transform transform_;
@@ -227,7 +227,7 @@ class GFX_EXPORT InterpolatedTransformAboutPivot
virtual ~InterpolatedTransformAboutPivot();
protected:
- virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
+ virtual gfx::Transform InterpolateButDoNotCompose(float t) const override;
private:
void Init(const gfx::Point& pivot, InterpolatedTransform* transform);
@@ -250,7 +250,7 @@ class GFX_EXPORT InterpolatedMatrixTransform : public InterpolatedTransform {
virtual ~InterpolatedMatrixTransform();
protected:
- virtual gfx::Transform InterpolateButDoNotCompose(float t) const OVERRIDE;
+ virtual gfx::Transform InterpolateButDoNotCompose(float t) const override;
private:
void Init(const gfx::Transform& start_transform,
« no previous file with comments | « ui/gfx/image/image_skia_operations.cc ('k') | ui/gfx/mac/coordinate_conversion_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698