Listen for APP_TERMINATING in notification ui; close windows earlier in the p...

chrome/browser/notifications/notification_ui_manager.h

Index: chrome/browser/notifications/notification_ui_manager.h
===================================================================
--- chrome/browser/notifications/notification_ui_manager.h	(revision 67750)
+++ chrome/browser/notifications/notification_ui_manager.h	(working copy)
@@ -13,6 +13,8 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
+#include "chrome/common/notification_observer.h"
+#include "chrome/common/notification_registrar.h"
 
 class Notification;
 class Profile;
@@ -22,7 +24,8 @@
 // The notification manager manages use of the desktop for notifications.
 // It maintains a queue of pending notifications when space becomes constrained.
 class NotificationUIManager
-    : public BalloonCollection::BalloonSpaceChangeListener {
+    : public BalloonCollection::BalloonSpaceChangeListener,
+      public NotificationObserver {
  public:
   NotificationUIManager();
   virtual ~NotificationUIManager();
@@ -53,11 +56,20 @@
   // queue.  Returns true if anything was removed.
   virtual bool CancelAllBySourceOrigin(const GURL& source_origin);
 
+  // Cancels all pending notifications and closes anything currently showing.
+  // Used when the app is terminating.
+  void CancelAll();
+
   // Returns balloon collection.
   BalloonCollection* balloon_collection() {
     return balloon_collection_.get();
   }
 
+  // NotificationObserver interface (the event signaling kind of notifications)
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details);
+
  private:
   // Attempts to display notifications from the show_queue if the user
   // is active.
@@ -80,6 +92,9 @@
   typedef std::deque<QueuedNotification*> NotificationDeque;
   NotificationDeque show_queue_;
 
+  // Registrar for the other kind of notifications (event signaling).
+  NotificationRegistrar registrar_;
+
   DISALLOW_COPY_AND_ASSIGN(NotificationUIManager);
 };