| Index: chrome/browser/notifications/message_center_notification_manager.h
|
| diff --git a/chrome/browser/notifications/message_center_notification_manager.h b/chrome/browser/notifications/message_center_notification_manager.h
|
| index 918fb11c7222df4a3da4ec530b054eb0526e9667..6ae1ad8aa0e67ff3c1b575c4331218cf11f5d543 100644
|
| --- a/chrome/browser/notifications/message_center_notification_manager.h
|
| +++ b/chrome/browser/notifications/message_center_notification_manager.h
|
| @@ -19,8 +19,6 @@
|
| #include "chrome/browser/notifications/notification.h"
|
| #include "chrome/browser/notifications/notification_system_observer.h"
|
| #include "chrome/browser/notifications/notification_ui_manager.h"
|
| -#include "content/public/browser/notification_observer.h"
|
| -#include "content/public/browser/notification_registrar.h"
|
| #include "ui/message_center/message_center.h"
|
| #include "ui/message_center/message_center_observer.h"
|
| #include "ui/message_center/message_center_tray_delegate.h"
|
| @@ -41,8 +39,7 @@ FORWARD_DECLARE_TEST(WebNotificationTrayTest, ManuallyCloseMessageCenter);
|
| // of notifications to MessageCenter, doing necessary conversions.
|
| class MessageCenterNotificationManager
|
| : public NotificationUIManager,
|
| - public message_center::MessageCenterObserver,
|
| - public content::NotificationObserver {
|
| + public message_center::MessageCenterObserver {
|
| public:
|
| MessageCenterNotificationManager(
|
| message_center::MessageCenter* message_center,
|
| @@ -91,12 +88,6 @@ class MessageCenterNotificationManager
|
| void SetMessageCenterTrayDelegateForTest(
|
| message_center::MessageCenterTrayDelegate* delegate);
|
|
|
| - protected:
|
| - // content::NotificationObserver override.
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| -
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(message_center::WebNotificationTrayTest,
|
| ManuallyCloseMessageCenter);
|
| @@ -236,9 +227,6 @@ class MessageCenterNotificationManager
|
| // To own the blockers.
|
| ScopedVector<message_center::NotificationBlocker> blockers_;
|
|
|
| - // Registrar for the other kind of notifications (event signaling).
|
| - content::NotificationRegistrar registrar_;
|
| -
|
| NotificationSystemObserver system_observer_;
|
|
|
| // Keeps track of all notification statistics for UMA purposes.
|
|
|