| 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_);
|
| }
|
|
|