| 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 72f5053afc8b802ae4c88829aadb8f7f72e2320c..6db72f6f857ec1f6f4db18f80114d908ea2e4781 100644
|
| --- a/ui/views/layout/grid_layout_unittest.cc
|
| +++ b/ui/views/layout/grid_layout_unittest.cc
|
| @@ -24,9 +24,7 @@ class SettableSizeView : public View {
|
| pref_ = pref;
|
| }
|
|
|
| - virtual gfx::Size GetPreferredSize() const override {
|
| - return pref_;
|
| - }
|
| + gfx::Size GetPreferredSize() const override { return pref_; }
|
|
|
| private:
|
| gfx::Size pref_;
|
| @@ -39,11 +37,11 @@ class FlexibleView : public View {
|
| circumference_ = circumference;
|
| }
|
|
|
| - virtual gfx::Size GetPreferredSize() const override {
|
| + gfx::Size GetPreferredSize() const override {
|
| return gfx::Size(0, circumference_ / 2);
|
| }
|
|
|
| - virtual int GetHeightForWidth(int width) const override {
|
| + int GetHeightForWidth(int width) const override {
|
| return std::max(0, circumference_ / 2 - width);
|
| }
|
|
|
|
|