| Index: ui/views/layout/grid_layout_unittest.cc
|
| diff --git a/ui/views/layout/grid_layout_unittest.cc b/ui/views/layout/grid_layout_unittest.cc
|
| index ea7d231f04b459700ba19f409a3fedd05b302279..72f5053afc8b802ae4c88829aadb8f7f72e2320c 100644
|
| --- a/ui/views/layout/grid_layout_unittest.cc
|
| +++ b/ui/views/layout/grid_layout_unittest.cc
|
| @@ -24,7 +24,7 @@ class SettableSizeView : public View {
|
| pref_ = pref;
|
| }
|
|
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE {
|
| + virtual gfx::Size GetPreferredSize() const override {
|
| return pref_;
|
| }
|
|
|
| @@ -39,11 +39,11 @@ class FlexibleView : public View {
|
| circumference_ = circumference;
|
| }
|
|
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE {
|
| + virtual gfx::Size GetPreferredSize() const override {
|
| return gfx::Size(0, circumference_ / 2);
|
| }
|
|
|
| - virtual int GetHeightForWidth(int width) const OVERRIDE {
|
| + virtual int GetHeightForWidth(int width) const override {
|
| return std::max(0, circumference_ / 2 - width);
|
| }
|
|
|
|
|