Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(521)

Unified Diff: ui/views/window/dialog_delegate_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/window/dialog_delegate.h ('k') | ui/views/window/native_frame_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b3551043be34cbd7d5048e266b329a513261bb9a..bbfa66beef616f8430780bacdb5e376da9f22b19 100644
--- a/ui/views/window/dialog_delegate_unittest.cc
+++ b/ui/views/window/dialog_delegate_unittest.cc
@@ -27,24 +27,24 @@ class TestDialog : public DialogDelegateView, public ButtonListener {
virtual ~TestDialog() {}
// DialogDelegateView overrides:
- virtual bool Cancel() OVERRIDE {
+ virtual bool Cancel() override {
canceled_ = true;
return closeable_;
}
- virtual bool Accept() OVERRIDE {
+ virtual bool Accept() override {
accepted_ = true;
return closeable_;
}
// DialogDelegateView overrides:
- virtual gfx::Size GetPreferredSize() const OVERRIDE {
+ 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; }
+ virtual base::string16 GetWindowTitle() const override { return title_; }
+ virtual bool UseNewStyleForThisDialog() const override { return true; }
// ButtonListener override:
- virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE {
+ virtual void ButtonPressed(Button* sender, const ui::Event& event) override {
last_pressed_button_ = sender;
}
@@ -94,13 +94,13 @@ class DialogTest : public ViewsTestBase {
DialogTest() : dialog_(NULL) {}
virtual ~DialogTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ViewsTestBase::SetUp();
dialog_ = new TestDialog();
DialogDelegate::CreateDialogWidget(dialog_, GetContext(), NULL)->Show();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
dialog_->TearDown();
ViewsTestBase::TearDown();
}
« no previous file with comments | « ui/views/window/dialog_delegate.h ('k') | ui/views/window/native_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698