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

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

Issue 661033006: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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_client_view.h ('k') | ui/views/window/dialog_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/window/dialog_client_view_unittest.cc
diff --git a/ui/views/window/dialog_client_view_unittest.cc b/ui/views/window/dialog_client_view_unittest.cc
index 6f4812cbae284082d83d92d9d9dd9b2f4196d6f1..17c3b2f482a4faf1c4e56501648981e64ab6cd12 100644
--- a/ui/views/window/dialog_client_view_unittest.cc
+++ b/ui/views/window/dialog_client_view_unittest.cc
@@ -20,10 +20,10 @@ class TestDialogClientView : public DialogClientView {
DialogDelegate* dialog_delegate)
: DialogClientView(contents_view),
dialog_(dialog_delegate) {}
- virtual ~TestDialogClientView() {}
+ ~TestDialogClientView() override {}
// DialogClientView implementation.
- virtual DialogDelegate* GetDialogDelegate() const override { return dialog_; }
+ DialogDelegate* GetDialogDelegate() const override { return dialog_; }
View* GetContentsView() { return contents_view(); }
@@ -45,10 +45,10 @@ class DialogClientViewTest : public ViewsTestBase,
: dialog_buttons_(ui::DIALOG_BUTTON_NONE),
extra_view_(NULL),
footnote_view_(NULL) {}
- virtual ~DialogClientViewTest() {}
+ ~DialogClientViewTest() override {}
// testing::Test implementation.
- virtual void SetUp() override {
+ void SetUp() override {
dialog_buttons_ = ui::DIALOG_BUTTON_NONE;
contents_.reset(new StaticSizedView(gfx::Size(100, 200)));
client_view_.reset(new TestDialogClientView(contents_.get(), this));
@@ -57,10 +57,10 @@ class DialogClientViewTest : public ViewsTestBase,
}
// DialogDelegateView implementation.
- virtual View* GetContentsView() override { return contents_.get(); }
- virtual View* CreateExtraView() override { return extra_view_; }
- virtual View* CreateFootnoteView() override { return footnote_view_; }
- virtual int GetDialogButtons() const override { return dialog_buttons_; }
+ View* GetContentsView() override { return contents_.get(); }
+ View* CreateExtraView() override { return extra_view_; }
+ View* CreateFootnoteView() override { return footnote_view_; }
+ int GetDialogButtons() const override { return dialog_buttons_; }
protected:
gfx::Rect GetUpdatedClientBounds() {
« no previous file with comments | « ui/views/window/dialog_client_view.h ('k') | ui/views/window/dialog_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698