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/wm/core/user_activity_detector_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/wm/core/user_activity_detector.h ('k') | ui/wm/core/visibility_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/user_activity_detector_unittest.cc
diff --git a/ui/wm/core/user_activity_detector_unittest.cc b/ui/wm/core/user_activity_detector_unittest.cc
index 620ab0c206a9db32e5cc772400d503b9920b3cf3..0273093c9bb0456f22647e97abb9df2e5b9a94ac 100644
--- a/ui/wm/core/user_activity_detector_unittest.cc
+++ b/ui/wm/core/user_activity_detector_unittest.cc
@@ -26,7 +26,7 @@ class TestUserActivityObserver : public UserActivityObserver {
void reset_stats() { num_invocations_ = 0; }
// UserActivityObserver implementation.
- virtual void OnUserActivity(const ui::Event* event) OVERRIDE {
+ virtual void OnUserActivity(const ui::Event* event) override {
num_invocations_++;
}
@@ -42,7 +42,7 @@ class UserActivityDetectorTest : public aura::test::AuraTestBase {
UserActivityDetectorTest() {}
virtual ~UserActivityDetectorTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
AuraTestBase::SetUp();
observer_.reset(new TestUserActivityObserver);
detector_.reset(new UserActivityDetector);
@@ -52,7 +52,7 @@ class UserActivityDetectorTest : public aura::test::AuraTestBase {
detector_->set_now_for_test(now_);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
detector_->RemoveObserver(observer_.get());
AuraTestBase::TearDown();
}
« no previous file with comments | « ui/wm/core/user_activity_detector.h ('k') | ui/wm/core/visibility_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698