| Index: chrome/browser/ui/views/constrained_window_views_unittest.cc
|
| diff --git a/chrome/browser/ui/views/constrained_window_views_unittest.cc b/chrome/browser/ui/views/constrained_window_views_unittest.cc
|
| index 31a5280b9d54b6ca7fbb9158a854308de49d027a..2f99340c33a2624d9ed0b8ebcb5bd63c0ae78b22 100644
|
| --- a/chrome/browser/ui/views/constrained_window_views_unittest.cc
|
| +++ b/chrome/browser/ui/views/constrained_window_views_unittest.cc
|
| @@ -26,11 +26,11 @@ class DialogContents : public DialogDelegateView {
|
| }
|
|
|
| // Overriden from DialogDelegateView:
|
| - virtual View* GetContentsView() OVERRIDE { return this; }
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE {
|
| + virtual View* GetContentsView() override { return this; }
|
| + virtual gfx::Size GetPreferredSize() const override {
|
| return preferred_size_;
|
| }
|
| - virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); }
|
| + virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); }
|
|
|
| private:
|
| gfx::Size preferred_size_;
|
| @@ -43,7 +43,7 @@ class ConstrainedWindowViewsTest : public ViewsTestBase {
|
| ConstrainedWindowViewsTest() : contents_(NULL) {}
|
| virtual ~ConstrainedWindowViewsTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| ViewsTestBase::SetUp();
|
| contents_ = new DialogContents;
|
| Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
|
| @@ -62,7 +62,7 @@ class ConstrainedWindowViewsTest : public ViewsTestBase {
|
| contents()->set_preferred_size(preferred_size);
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| ViewsTestBase::TearDown();
|
| contents_ = NULL;
|
| dialog_host_.reset();
|
|
|