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

Unified Diff: ui/views/layout/grid_layout.cc

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/views/layout/grid_layout.h ('k') | ui/views/layout/grid_layout_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/layout/grid_layout.cc
diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc
index 7ab81083c34bb9609179085e30d3fb555c2aaf26..99b39f2b058faf1b4857b9c9a32565bbe7051906 100644
--- a/ui/views/layout/grid_layout.cc
+++ b/ui/views/layout/grid_layout.cc
@@ -178,7 +178,7 @@ class Column : public LayoutElement {
GridLayout::Alignment h_align() { return h_align_; }
GridLayout::Alignment v_align() { return v_align_; }
- virtual void ResetSize() OVERRIDE;
+ virtual void ResetSize() override;
private:
friend class ColumnSet;
@@ -190,7 +190,7 @@ class Column : public LayoutElement {
// to that size. This should only be used for the master column.
void UnifySameSizedColumnSizes();
- virtual void AdjustSize(int size) OVERRIDE;
+ virtual void AdjustSize(int size) override;
const GridLayout::Alignment h_align_;
const GridLayout::Alignment v_align_;
@@ -269,7 +269,7 @@ class Row : public LayoutElement {
virtual ~Row() {}
- virtual void ResetSize() OVERRIDE {
+ virtual void ResetSize() override {
max_ascent_ = max_descent_ = 0;
SetSize(height_);
}
« no previous file with comments | « ui/views/layout/grid_layout.h ('k') | ui/views/layout/grid_layout_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698