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

Unified Diff: ui/message_center/message_center_impl_unittest.cc

Issue 667923002: Standardize usage of virtual/override/final in ui/ (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 | « 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 f0453e5bf8c15956229b565098306585b16fb0fc..6ce913122a7341cecb4488abf97c75a36f04eaf1 100644
--- a/ui/message_center/message_center_impl_unittest.cc
+++ b/ui/message_center/message_center_impl_unittest.cc
@@ -107,7 +107,7 @@ class ToggledNotificationBlocker : public NotificationBlocker {
explicit ToggledNotificationBlocker(MessageCenter* message_center)
: NotificationBlocker(message_center),
notifications_enabled_(true) {}
- virtual ~ToggledNotificationBlocker() {}
+ ~ToggledNotificationBlocker() override {}
void SetNotificationsEnabled(bool enabled) {
if (notifications_enabled_ != enabled) {
@@ -117,7 +117,7 @@ class ToggledNotificationBlocker : public NotificationBlocker {
}
// NotificationBlocker overrides:
- virtual bool ShouldShowNotificationAsPopup(
+ bool ShouldShowNotificationAsPopup(
const message_center::NotifierId& notifier_id) const override {
return notifications_enabled_;
}
@@ -134,10 +134,10 @@ class PopupNotificationBlocker : public ToggledNotificationBlocker {
const NotifierId& allowed_notifier)
: ToggledNotificationBlocker(message_center),
allowed_notifier_(allowed_notifier) {}
- virtual ~PopupNotificationBlocker() {}
+ ~PopupNotificationBlocker() override {}
// NotificationBlocker overrides:
- virtual bool ShouldShowNotificationAsPopup(
+ bool ShouldShowNotificationAsPopup(
const NotifierId& notifier_id) const override {
return (notifier_id == allowed_notifier_) ||
ToggledNotificationBlocker::ShouldShowNotificationAsPopup(notifier_id);
@@ -154,11 +154,10 @@ class TotalNotificationBlocker : public PopupNotificationBlocker {
TotalNotificationBlocker(MessageCenter* message_center,
const NotifierId& allowed_notifier)
: PopupNotificationBlocker(message_center, allowed_notifier) {}
- virtual ~TotalNotificationBlocker() {}
+ ~TotalNotificationBlocker() override {}
// NotificationBlocker overrides:
- virtual bool ShouldShowNotification(
- const NotifierId& notifier_id) const override {
+ bool ShouldShowNotification(const NotifierId& notifier_id) const override {
return ShouldShowNotificationAsPopup(notifier_id);
}
@@ -200,9 +199,9 @@ class MockPopupTimersController : public PopupTimersController {
: PopupTimersController(message_center),
timer_finished_(false),
quit_closure_(quit_closure) {}
- virtual ~MockPopupTimersController() {}
+ ~MockPopupTimersController() override {}
- virtual void TimerFinished(const std::string& id) override {
+ 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