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

Unified Diff: ui/gfx/geometry/r_tree_base.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/font_render_params_win.cc ('k') | ui/gfx/icon_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/geometry/r_tree_base.h
diff --git a/ui/gfx/geometry/r_tree_base.h b/ui/gfx/geometry/r_tree_base.h
index 21dc86b2d4d8b5f4f0783dcb55a5ce0b52275cb1..b83aeefc0e525b978c7889f9f2e49b4b37a6947b 100644
--- a/ui/gfx/geometry/r_tree_base.h
+++ b/ui/gfx/geometry/r_tree_base.h
@@ -96,10 +96,10 @@ class GFX_EXPORT RTreeBase {
virtual ~RecordBase();
virtual void AppendIntersectingRecords(const Rect& query_rect,
- Records* records_out) const OVERRIDE;
- virtual void AppendAllRecords(Records* records_out) const OVERRIDE;
- virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() OVERRIDE;
- virtual int Level() const OVERRIDE;
+ Records* records_out) const override;
+ virtual void AppendAllRecords(Records* records_out) const override;
+ virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() override;
+ virtual int Level() const override;
private:
friend class RTreeTest;
@@ -115,10 +115,10 @@ class GFX_EXPORT RTreeBase {
virtual ~Node();
virtual void AppendIntersectingRecords(const Rect& query_rect,
- Records* records_out) const OVERRIDE;
- virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() OVERRIDE;
- virtual int Level() const OVERRIDE;
- virtual void AppendAllRecords(Records* matches_out) const OVERRIDE;
+ Records* records_out) const override;
+ virtual scoped_ptr<NodeBase> RemoveAndReturnLastChild() override;
+ virtual int Level() const override;
+ virtual void AppendAllRecords(Records* matches_out) const override;
// Constructs a new Node that is the parent of this Node and already has
// this Node as its sole child. Valid to call only on root Nodes, meaning
@@ -219,7 +219,7 @@ class GFX_EXPORT RTreeBase {
Rects* vertical_bounds,
Rects* horizontal_bounds);
- virtual void RecomputeLocalBounds() OVERRIDE;
+ virtual void RecomputeLocalBounds() override;
// Returns the increase in overlap value, as defined in Beckmann et al. as
// the sum of the areas of the intersection of all child rectangles
« no previous file with comments | « ui/gfx/font_render_params_win.cc ('k') | ui/gfx/icon_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698