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

chrome/browser/notifications/notification_ui_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/notifications/notification_ui_manager.h"
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/renderer_host/site_instance.h"
+#include "chrome/common/notification_service.h"
+#include "chrome/common/notification_type.h"
 
 // A class which represents a notification waiting to be shown.
 class QueuedNotification {
  public:
   QueuedNotification(const Notification& notification, Profile* profile)
       : notification_(notification),
         profile_(profile) {
   }
 
   const Notification& notification() const { return notification_; }
   Profile* profile() const { return profile_; }
 
   void Replace(const Notification& new_notification) {
     notification_ = new_notification;
   }
 
  private:
   // The notification to be shown.
   Notification notification_;
 
   // Non owned pointer to the user's profile.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(QueuedNotification);
 };
 
 NotificationUIManager::NotificationUIManager()
     : balloon_collection_(NULL) {
+  registrar_.Add(this, NotificationType::APP_TERMINATING,
+                 NotificationService::AllSources());
 }
 
 NotificationUIManager::~NotificationUIManager() {
   STLDeleteElements(&show_queue_);
 }
 
 // static
 NotificationUIManager* NotificationUIManager::Create() {
   BalloonCollection* balloons = BalloonCollection::Create();
   NotificationUIManager* instance = new NotificationUIManager();
@@ skipping 28 matching lines @@
   return balloon_collection_->RemoveById(id);
 }
 
 bool NotificationUIManager::CancelAllBySourceOrigin(const GURL& source) {
   // Same pattern as CancelById, but more complicated than the above
   // because there may be multiple notifications from the same source.
   bool removed = false;
   NotificationDeque::iterator iter;
   for (iter = show_queue_.begin(); iter != show_queue_.end(); ++iter) {
     if ((*iter)->notification().origin_url() == source) {
       iter = show_queue_.erase(iter);

[Andrew T Wilson (Slow), 2010/12/01 01:55:56]

You are tracking this separately, but just wanted to point out that we're
leaking a QueuedNotification here.

       removed = true;
     } else {
       ++iter;
     }
   }
 
   return balloon_collection_->RemoveBySourceOrigin(source) || removed;
 }
 
+void NotificationUIManager::CancelAll() {
+  STLDeleteElements(&show_queue_);
+  balloon_collection_->RemoveAll();
+}
+
 void NotificationUIManager::CheckAndShowNotifications() {
   // TODO(johnnyg): http://crbug.com/25061 - Check for user idle/presentation.
   ShowNotifications();
 }
 
 void NotificationUIManager::ShowNotifications() {
   while (!show_queue_.empty() && balloon_collection_->HasSpace()) {
     scoped_ptr<QueuedNotification> queued_notification(show_queue_.front());
     show_queue_.pop_front();
     balloon_collection_->Add(queued_notification->notification(),
@@ skipping 31 matching lines @@
        ++balloon_iter) {
     if (origin == (*balloon_iter)->notification().origin_url() &&
         replace_id == (*balloon_iter)->notification().replace_id()) {
       (*balloon_iter)->Update(notification);
       return true;
     }
   }
 
   return false;
 }
+
+void NotificationUIManager::Observe(NotificationType type,
+                                    const NotificationSource& source,
+                                    const NotificationDetails& details) {
+  if (type == NotificationType::APP_TERMINATING)
+    CancelAll();

[Andrew T Wilson (Slow), 2010/12/01 01:55:56]

Could also be CHECK(type == NotificationType::APP_TERMINATING). But this is cool
too.

+  else
+    NOTREACHED();
+}