| Index: ui/views/window/dialog_delegate_unittest.cc
|
| diff --git a/ui/views/window/dialog_delegate_unittest.cc b/ui/views/window/dialog_delegate_unittest.cc
|
| index 7bbf191a1f4dd61fdf0c4efa6106b52b8ea1ec79..7f9149065da2636b9c5614aabf9ec95871a5e04e 100644
|
| --- a/ui/views/window/dialog_delegate_unittest.cc
|
| +++ b/ui/views/window/dialog_delegate_unittest.cc
|
| @@ -24,27 +24,25 @@ class TestDialog : public DialogDelegateView, public ButtonListener {
|
| accepted_(false),
|
| closeable_(false),
|
| last_pressed_button_(NULL) {}
|
| - virtual ~TestDialog() {}
|
| + ~TestDialog() override {}
|
|
|
| // DialogDelegateView overrides:
|
| - virtual bool Cancel() override {
|
| + bool Cancel() override {
|
| canceled_ = true;
|
| return closeable_;
|
| }
|
| - virtual bool Accept() override {
|
| + bool Accept() override {
|
| accepted_ = true;
|
| return closeable_;
|
| }
|
|
|
| // DialogDelegateView overrides:
|
| - virtual gfx::Size GetPreferredSize() const override {
|
| - return gfx::Size(200, 200);
|
| - }
|
| - virtual base::string16 GetWindowTitle() const override { return title_; }
|
| - virtual bool UseNewStyleForThisDialog() const override { return true; }
|
| + gfx::Size GetPreferredSize() const override { return gfx::Size(200, 200); }
|
| + base::string16 GetWindowTitle() const override { return title_; }
|
| + bool UseNewStyleForThisDialog() const override { return true; }
|
|
|
| // ButtonListener override:
|
| - virtual void ButtonPressed(Button* sender, const ui::Event& event) override {
|
| + void ButtonPressed(Button* sender, const ui::Event& event) override {
|
| last_pressed_button_ = sender;
|
| }
|
|
|
| @@ -92,15 +90,15 @@ class TestDialog : public DialogDelegateView, public ButtonListener {
|
| class DialogTest : public ViewsTestBase {
|
| public:
|
| DialogTest() : dialog_(NULL) {}
|
| - virtual ~DialogTest() {}
|
| + ~DialogTest() override {}
|
|
|
| - virtual void SetUp() override {
|
| + void SetUp() override {
|
| ViewsTestBase::SetUp();
|
| dialog_ = new TestDialog();
|
| DialogDelegate::CreateDialogWidget(dialog_, GetContext(), NULL)->Show();
|
| }
|
|
|
| - virtual void TearDown() override {
|
| + void TearDown() override {
|
| dialog_->TearDown();
|
| ViewsTestBase::TearDown();
|
| }
|
|
|