Add CloseAllByProfile to NotificationUIManager and call before destroyng a Profile

chrome/browser/notifications/notification_ui_manager_impl.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 78 matching lines @@
 
   VLOG(1) << "Added notification. URL: "
           << notification.content_url().spec();
   show_queue_.push_back(
       new QueuedNotification(notification, profile));
   CheckAndShowNotifications();
 }
 
 bool NotificationUIManagerImpl::CancelById(const std::string& id) {
   // See if this ID hasn't been shown yet.
-  NotificationDeque::iterator iter;
-  for (iter = show_queue_.begin(); iter != show_queue_.end(); ++iter) {
+  for (NotificationDeque::iterator iter = show_queue_.begin();
+       iter != show_queue_.end(); ++iter) {
     if ((*iter)->notification().notification_id() == id) {
       show_queue_.erase(iter);
       return true;
     }
   }
   // If it has been shown, remove it from the balloon collections.
   return balloon_collection_->RemoveById(id);
 }
 
 bool NotificationUIManagerImpl::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();) {
-    if ((*iter)->notification().origin_url() == source) {
-      iter = show_queue_.erase(iter);
+  for (NotificationDeque::iterator loopiter = show_queue_.begin();
+       loopiter != show_queue_.end(); ) {
+    NotificationDeque::iterator curiter = loopiter++;
+    if ((*curiter)->notification().origin_url() == source) {
+      show_queue_.erase(curiter);
       removed = true;
-    } else {
-      ++iter;
     }
   }
+  return balloon_collection_->RemoveBySourceOrigin(source) || removed;
+}
 
-  return balloon_collection_->RemoveBySourceOrigin(source) || removed;
+bool NotificationUIManagerImpl::CancelAllByProfile(Profile* profile) {
+  // Same pattern as CancelAllBySourceOrigin.
+  bool removed = false;
+  for (NotificationDeque::iterator loopiter = show_queue_.begin();
+       loopiter != show_queue_.end(); ) {
+    NotificationDeque::iterator curiter = loopiter++;
+    if ((*curiter)->profile() == profile) {
+      show_queue_.erase(curiter);
+      removed = true;
+    }
+  }
+  return balloon_collection_->RemoveByProfile(profile) || removed;
 }
 
 void NotificationUIManagerImpl::CancelAll() {
   STLDeleteElements(&show_queue_);
   balloon_collection_->RemoveAll();
 }
 
 BalloonCollection* NotificationUIManagerImpl::balloon_collection() {
   return balloon_collection_.get();
 }
@@ skipping 43 matching lines @@
 bool NotificationUIManagerImpl::TryReplacement(
     const Notification& notification) {
   const GURL& origin = notification.origin_url();
   const string16& replace_id = notification.replace_id();
 
   if (replace_id.empty())
     return false;
 
   // First check the queue of pending notifications for replacement.
   // Then check the list of notifications already being shown.
-  NotificationDeque::iterator iter;
-  for (iter = show_queue_.begin(); iter != show_queue_.end(); ++iter) {
+  for (NotificationDeque::const_iterator iter = show_queue_.begin();
+       iter != show_queue_.end(); ++iter) {
     if (origin == (*iter)->notification().origin_url() &&
         replace_id == (*iter)->notification().replace_id()) {
       (*iter)->Replace(notification);
       return true;
     }
   }
 
-  BalloonCollection::Balloons::iterator balloon_iter;
-  BalloonCollection::Balloons balloons =
+  const BalloonCollection::Balloons& balloons =

[stevenjb, 2012/11/29 02:52:25]

Note: now a reference

       balloon_collection_->GetActiveBalloons();
-  for (balloon_iter = balloons.begin();
-       balloon_iter != balloons.end();
-       ++balloon_iter) {
-    if (origin == (*balloon_iter)->notification().origin_url() &&
-        replace_id == (*balloon_iter)->notification().replace_id()) {
-      (*balloon_iter)->Update(notification);
+  for (BalloonCollection::Balloons::const_iterator iter = balloons.begin();

[stevenjb, 2012/11/29 02:52:25]

Note: now a const_iterator. This worked before only because were were copying
pointers and not modifying |balloons|.

+       iter != balloons.end(); ++iter) {
+    if (origin == (*iter)->notification().origin_url() &&
+        replace_id == (*iter)->notification().replace_id()) {
+      (*iter)->Update(notification);
       return true;
     }
   }
 
   return false;
 }
 
 BalloonCollection::PositionPreference
 NotificationUIManagerImpl::GetPositionPreference() const {
   LOG(INFO) << "Current position preference: " << position_pref_.GetValue();
 
   return static_cast<BalloonCollection::PositionPreference>(
       position_pref_.GetValue());
 }
 
 void NotificationUIManagerImpl::SetPositionPreference(
     BalloonCollection::PositionPreference preference) {
   LOG(INFO) << "Setting position preference: " << preference;
   position_pref_.SetValue(static_cast<int>(preference));
   balloon_collection_->SetPositionPreference(preference);
 }
 
 void NotificationUIManagerImpl::GetQueuedNotificationsForTesting(
     std::vector<const Notification*>* notifications) {
-  NotificationDeque::const_iterator queued_iter;
-  for (queued_iter = show_queue_.begin(); queued_iter != show_queue_.end();
-       ++queued_iter) {
-    notifications->push_back(&(*queued_iter)->notification());
+  for (NotificationDeque::const_iterator iter = show_queue_.begin();
+       iter != show_queue_.end(); ++iter) {
+    notifications->push_back(&(*iter)->notification());
   }
 }
 
 void NotificationUIManagerImpl::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_APP_TERMINATING) {
     CancelAll();
   } else {
     NOTREACHED();
   }
 }
 
 void NotificationUIManagerImpl::OnDesktopNotificationPositionChanged() {
   balloon_collection_->SetPositionPreference(
       static_cast<BalloonCollection::PositionPreference>(
           position_pref_.GetValue()));
 }