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

Unified Diff: ash/first_run/first_run_helper_unittest.cc

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround Created 5 years, 11 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 | « ash/display/resolution_notification_controller_unittest.cc ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/first_run/first_run_helper_unittest.cc
diff --git a/ash/first_run/first_run_helper_unittest.cc b/ash/first_run/first_run_helper_unittest.cc
index 4552ff4335a543f740f20d168177644f46b51d00..bdf790cbc83fe2561cf846c9bce20d2b067840bb 100644
--- a/ash/first_run/first_run_helper_unittest.cc
+++ b/ash/first_run/first_run_helper_unittest.cc
@@ -21,12 +21,10 @@ namespace {
class TestModalDialogDelegate : public views::DialogDelegateView {
public:
TestModalDialogDelegate() {}
- virtual ~TestModalDialogDelegate() {}
+ ~TestModalDialogDelegate() override {}
// Overridden from views::WidgetDelegate:
- virtual ui::ModalType GetModalType() const override {
- return ui::MODAL_TYPE_SYSTEM;
- }
+ ui::ModalType GetModalType() const override { return ui::MODAL_TYPE_SYSTEM; }
private:
DISALLOW_COPY_AND_ASSIGN(TestModalDialogDelegate);
@@ -41,11 +39,11 @@ class CountingEventHandler : public ui::EventHandler {
*mouse_events_registered = 0;
}
- virtual ~CountingEventHandler() {}
+ ~CountingEventHandler() override {}
private:
// ui::EventHandler overrides.
- virtual void OnMouseEvent(ui::MouseEvent* event) override {
+ void OnMouseEvent(ui::MouseEvent* event) override {
++*mouse_events_registered_;
}
@@ -61,9 +59,9 @@ class FirstRunHelperTest : public AshTestBase,
public:
FirstRunHelperTest() : cancelled_times_(0) {}
- virtual ~FirstRunHelperTest() {}
+ ~FirstRunHelperTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
AshTestBase::SetUp();
CheckContainersAreVisible();
helper_.reset(ash::Shell::GetInstance()->CreateFirstRunHelper());
@@ -71,7 +69,7 @@ class FirstRunHelperTest : public AshTestBase,
helper_->GetOverlayWidget()->Show();
}
- virtual void TearDown() override {
+ void TearDown() override {
EXPECT_TRUE(helper_.get());
helper_.reset();
CheckContainersAreVisible();
@@ -106,9 +104,7 @@ class FirstRunHelperTest : public AshTestBase,
private:
// FirstRunHelper::Observer overrides.
- virtual void OnCancelled() override {
- ++cancelled_times_;
- }
+ void OnCancelled() override { ++cancelled_times_; }
scoped_ptr<FirstRunHelper> helper_;
int cancelled_times_;
« no previous file with comments | « ash/display/resolution_notification_controller_unittest.cc ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698