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

Unified Diff: ui/message_center/message_center_impl_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/message_center/message_center_impl.h ('k') | ui/message_center/message_center_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/message_center_impl_unittest.cc
diff --git a/ui/message_center/message_center_impl_unittest.cc b/ui/message_center/message_center_impl_unittest.cc
index 913c8a2e33cb40c24e8704f755de3527f12ff835..f0453e5bf8c15956229b565098306585b16fb0fc 100644
--- a/ui/message_center/message_center_impl_unittest.cc
+++ b/ui/message_center/message_center_impl_unittest.cc
@@ -27,7 +27,7 @@ class MessageCenterImplTest : public testing::Test,
public:
MessageCenterImplTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
MessageCenter::Initialize();
message_center_ = MessageCenter::Get();
loop_.reset(new base::MessageLoop);
@@ -35,7 +35,7 @@ class MessageCenterImplTest : public testing::Test,
closure_ = run_loop_->QuitClosure();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
run_loop_.reset();
loop_.reset();
message_center_ = NULL;
@@ -118,7 +118,7 @@ class ToggledNotificationBlocker : public NotificationBlocker {
// NotificationBlocker overrides:
virtual bool ShouldShowNotificationAsPopup(
- const message_center::NotifierId& notifier_id) const OVERRIDE {
+ const message_center::NotifierId& notifier_id) const override {
return notifications_enabled_;
}
@@ -138,7 +138,7 @@ class PopupNotificationBlocker : public ToggledNotificationBlocker {
// NotificationBlocker overrides:
virtual bool ShouldShowNotificationAsPopup(
- const NotifierId& notifier_id) const OVERRIDE {
+ const NotifierId& notifier_id) const override {
return (notifier_id == allowed_notifier_) ||
ToggledNotificationBlocker::ShouldShowNotificationAsPopup(notifier_id);
}
@@ -158,7 +158,7 @@ class TotalNotificationBlocker : public PopupNotificationBlocker {
// NotificationBlocker overrides:
virtual bool ShouldShowNotification(
- const NotifierId& notifier_id) const OVERRIDE {
+ const NotifierId& notifier_id) const override {
return ShouldShowNotificationAsPopup(notifier_id);
}
@@ -202,7 +202,7 @@ class MockPopupTimersController : public PopupTimersController {
quit_closure_(quit_closure) {}
virtual ~MockPopupTimersController() {}
- virtual void TimerFinished(const std::string& id) OVERRIDE {
+ virtual void TimerFinished(const std::string& id) override {
base::MessageLoop::current()->PostTask(FROM_HERE, quit_closure_);
timer_finished_ = true;
last_id_ = id;
« no previous file with comments | « ui/message_center/message_center_impl.h ('k') | ui/message_center/message_center_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698