Index: ui/message_center/message_center_impl.h |
diff --git a/ui/message_center/message_center_impl.h b/ui/message_center/message_center_impl.h |
index 99480895f9074b8a18b47cfb1579ac34584ec9d4..d84e51471e0beeb663cdb9b07cafab400ca986f3 100644 |
--- a/ui/message_center/message_center_impl.h |
+++ b/ui/message_center/message_center_impl.h |
@@ -83,15 +83,13 @@ class MESSAGE_CENTER_EXPORT PopupTimersController |
public MessageCenterObserver { |
public: |
explicit PopupTimersController(MessageCenter* message_center); |
- virtual ~PopupTimersController(); |
+ ~PopupTimersController() override; |
// MessageCenterObserver implementation. |
- virtual void OnNotificationDisplayed( |
- const std::string& id, |
- const DisplaySource source) override; |
- virtual void OnNotificationUpdated(const std::string& id) override; |
- virtual void OnNotificationRemoved(const std::string& id, bool by_user) |
- override; |
+ void OnNotificationDisplayed(const std::string& id, |
+ const DisplaySource source) override; |
+ void OnNotificationUpdated(const std::string& id) override; |
+ void OnNotificationRemoved(const std::string& id, bool by_user) override; |
// Callback for each timer when its time is up. |
virtual void TimerFinished(const std::string& id); |
@@ -142,70 +140,64 @@ class MessageCenterImpl : public MessageCenter, |
public message_center::NotifierSettingsObserver { |
public: |
MessageCenterImpl(); |
- virtual ~MessageCenterImpl(); |
+ ~MessageCenterImpl() override; |
// MessageCenter overrides: |
- virtual void AddObserver(MessageCenterObserver* observer) override; |
- virtual void RemoveObserver(MessageCenterObserver* observer) override; |
- virtual void AddNotificationBlocker(NotificationBlocker* blocker) override; |
- virtual void RemoveNotificationBlocker(NotificationBlocker* blocker) override; |
- virtual void SetVisibility(Visibility visible) override; |
- virtual bool IsMessageCenterVisible() const override; |
- virtual size_t NotificationCount() const override; |
- virtual size_t UnreadNotificationCount() const override; |
- virtual bool HasPopupNotifications() const override; |
- virtual bool IsQuietMode() const override; |
- virtual bool HasClickedListener(const std::string& id) override; |
- virtual message_center::Notification* FindVisibleNotificationById( |
+ void AddObserver(MessageCenterObserver* observer) override; |
+ void RemoveObserver(MessageCenterObserver* observer) override; |
+ void AddNotificationBlocker(NotificationBlocker* blocker) override; |
+ void RemoveNotificationBlocker(NotificationBlocker* blocker) override; |
+ void SetVisibility(Visibility visible) override; |
+ bool IsMessageCenterVisible() const override; |
+ size_t NotificationCount() const override; |
+ size_t UnreadNotificationCount() const override; |
+ bool HasPopupNotifications() const override; |
+ bool IsQuietMode() const override; |
+ bool HasClickedListener(const std::string& id) override; |
+ message_center::Notification* FindVisibleNotificationById( |
const std::string& id) override; |
- virtual const NotificationList::Notifications& GetVisibleNotifications() |
- override; |
- virtual NotificationList::PopupNotifications GetPopupNotifications() override; |
- virtual void AddNotification(scoped_ptr<Notification> notification) override; |
- virtual void UpdateNotification(const std::string& old_id, |
- scoped_ptr<Notification> new_notification) |
- override; |
- virtual void RemoveNotification(const std::string& id, bool by_user) override; |
- virtual void RemoveAllNotifications(bool by_user) override; |
- virtual void RemoveAllVisibleNotifications(bool by_user) override; |
- virtual void SetNotificationIcon(const std::string& notification_id, |
- const gfx::Image& image) override; |
- virtual void SetNotificationImage(const std::string& notification_id, |
- const gfx::Image& image) override; |
- virtual void SetNotificationButtonIcon(const std::string& notification_id, |
- int button_index, |
- const gfx::Image& image) override; |
- virtual void DisableNotificationsByNotifier( |
- const NotifierId& notifier_id) override; |
- virtual void ClickOnNotification(const std::string& id) override; |
- virtual void ClickOnNotificationButton(const std::string& id, |
- int button_index) override; |
- virtual void MarkSinglePopupAsShown(const std::string& id, |
- bool mark_notification_as_read) override; |
- virtual void DisplayedNotification( |
- const std::string& id, |
- const DisplaySource source) override; |
- virtual void SetNotifierSettingsProvider( |
- NotifierSettingsProvider* provider) override; |
- virtual NotifierSettingsProvider* GetNotifierSettingsProvider() override; |
- virtual void SetQuietMode(bool in_quiet_mode) override; |
- virtual void EnterQuietModeWithExpire( |
- const base::TimeDelta& expires_in) override; |
- virtual void RestartPopupTimers() override; |
- virtual void PausePopupTimers() override; |
+ const NotificationList::Notifications& GetVisibleNotifications() override; |
+ NotificationList::PopupNotifications GetPopupNotifications() override; |
+ void AddNotification(scoped_ptr<Notification> notification) override; |
+ void UpdateNotification(const std::string& old_id, |
+ scoped_ptr<Notification> new_notification) override; |
+ void RemoveNotification(const std::string& id, bool by_user) override; |
+ void RemoveAllNotifications(bool by_user) override; |
+ void RemoveAllVisibleNotifications(bool by_user) override; |
+ void SetNotificationIcon(const std::string& notification_id, |
+ const gfx::Image& image) override; |
+ void SetNotificationImage(const std::string& notification_id, |
+ const gfx::Image& image) override; |
+ void SetNotificationButtonIcon(const std::string& notification_id, |
+ int button_index, |
+ const gfx::Image& image) override; |
+ void DisableNotificationsByNotifier(const NotifierId& notifier_id) override; |
+ void ClickOnNotification(const std::string& id) override; |
+ void ClickOnNotificationButton(const std::string& id, |
+ int button_index) override; |
+ void MarkSinglePopupAsShown(const std::string& id, |
+ bool mark_notification_as_read) override; |
+ void DisplayedNotification(const std::string& id, |
+ const DisplaySource source) override; |
+ void SetNotifierSettingsProvider(NotifierSettingsProvider* provider) override; |
+ NotifierSettingsProvider* GetNotifierSettingsProvider() override; |
+ void SetQuietMode(bool in_quiet_mode) override; |
+ void EnterQuietModeWithExpire(const base::TimeDelta& expires_in) override; |
+ void RestartPopupTimers() override; |
+ void PausePopupTimers() override; |
// NotificationBlocker::Observer overrides: |
- virtual void OnBlockingStateChanged(NotificationBlocker* blocker) override; |
+ void OnBlockingStateChanged(NotificationBlocker* blocker) override; |
// message_center::NotifierSettingsObserver overrides: |
- virtual void UpdateIconImage(const NotifierId& notifier_id, |
- const gfx::Image& icon) override; |
- virtual void NotifierGroupChanged() override; |
- virtual void NotifierEnabledChanged(const NotifierId& notifier_id, |
- bool enabled) override; |
+ void UpdateIconImage(const NotifierId& notifier_id, |
+ const gfx::Image& icon) override; |
+ void NotifierGroupChanged() override; |
+ void NotifierEnabledChanged(const NotifierId& notifier_id, |
+ bool enabled) override; |
protected: |
- virtual void DisableTimersForTest() override; |
+ void DisableTimersForTest() override; |
private: |
struct NotificationCache { |