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

Unified Diff: ash/first_run/first_run_helper_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 | « ash/first_run/first_run_helper_impl.h ('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 df272aab18d091bbc7d0fc3ce7185d1040fdd1fc..4552ff4335a543f740f20d168177644f46b51d00 100644
--- a/ash/first_run/first_run_helper_unittest.cc
+++ b/ash/first_run/first_run_helper_unittest.cc
@@ -24,7 +24,7 @@ class TestModalDialogDelegate : public views::DialogDelegateView {
virtual ~TestModalDialogDelegate() {}
// Overridden from views::WidgetDelegate:
- virtual ui::ModalType GetModalType() const OVERRIDE {
+ virtual ui::ModalType GetModalType() const override {
return ui::MODAL_TYPE_SYSTEM;
}
@@ -45,7 +45,7 @@ class CountingEventHandler : public ui::EventHandler {
private:
// ui::EventHandler overrides.
- virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+ virtual void OnMouseEvent(ui::MouseEvent* event) override {
++*mouse_events_registered_;
}
@@ -63,7 +63,7 @@ class FirstRunHelperTest : public AshTestBase,
virtual ~FirstRunHelperTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
AshTestBase::SetUp();
CheckContainersAreVisible();
helper_.reset(ash::Shell::GetInstance()->CreateFirstRunHelper());
@@ -71,7 +71,7 @@ class FirstRunHelperTest : public AshTestBase,
helper_->GetOverlayWidget()->Show();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
EXPECT_TRUE(helper_.get());
helper_.reset();
CheckContainersAreVisible();
@@ -106,7 +106,7 @@ class FirstRunHelperTest : public AshTestBase,
private:
// FirstRunHelper::Observer overrides.
- virtual void OnCancelled() OVERRIDE {
+ virtual void OnCancelled() override {
++cancelled_times_;
}
« no previous file with comments | « ash/first_run/first_run_helper_impl.h ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698