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

Unified Diff: ash/system/chromeos/power/tray_power_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/system/chromeos/power/tray_power.cc ('k') | ash/system/chromeos/power/video_activity_notifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/power/tray_power_unittest.cc
diff --git a/ash/system/chromeos/power/tray_power_unittest.cc b/ash/system/chromeos/power/tray_power_unittest.cc
index 6be2dfcadf463eb81545af6ccf3e5d0618516e08..3678eec0807f560d04bd6c338b5fdec82aeb4836 100644
--- a/ash/system/chromeos/power/tray_power_unittest.cc
+++ b/ash/system/chromeos/power/tray_power_unittest.cc
@@ -24,11 +24,11 @@ class MockMessageCenter : public message_center::FakeMessageCenter {
int remove_count() const { return remove_count_; }
// message_center::FakeMessageCenter overrides:
- virtual void AddNotification(scoped_ptr<Notification> notification) OVERRIDE {
+ virtual void AddNotification(scoped_ptr<Notification> notification) override {
add_count_++;
}
virtual void RemoveNotification(const std::string& id, bool by_user)
- OVERRIDE {
+ override {
remove_count_++;
}
@@ -52,13 +52,13 @@ class TrayPowerTest : public test::AshTestBase {
TrayPower* tray_power() { return tray_power_.get(); }
// test::AshTestBase::SetUp() overrides:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
test::AshTestBase::SetUp();
message_center_.reset(new MockMessageCenter());
tray_power_.reset(new TrayPower(NULL, message_center_.get()));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
tray_power_.reset();
message_center_.reset();
test::AshTestBase::TearDown();
« no previous file with comments | « ash/system/chromeos/power/tray_power.cc ('k') | ash/system/chromeos/power/video_activity_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698