When an extension is uninstalled, close all desktop notifications from that e...

chrome/browser/notifications/balloon_collection.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/balloon_collection_impl.h"
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_host.h"
@@ skipping 27 matching lines @@
 
 BalloonCollectionImpl::BalloonCollectionImpl()
 #if USE_OFFSETS
     : ALLOW_THIS_IN_INITIALIZER_LIST(reposition_factory_(this)),
       added_as_message_loop_observer_(false)
 #endif
 {
 }
 
 BalloonCollectionImpl::~BalloonCollectionImpl() {
-  STLDeleteElements(&balloons_);
 }
 
 void BalloonCollectionImpl::Add(const Notification& notification,
                                 Profile* profile) {
   Balloon* new_balloon = MakeBalloon(notification, profile);
   // The +1 on width is necessary because width is fixed on notifications,
   // so since we always have the max size, we would always hit the scrollbar
   // condition.  We are only interested in comparing height to maximum.
   new_balloon->set_min_scrollbar_size(gfx::Size(1 + layout_.max_balloon_width(),
                                                 layout_.max_balloon_height()));
   new_balloon->SetPosition(layout_.OffScreenLocation(), false);
   new_balloon->Show();
 #if USE_OFFSETS
-  if (balloons_.size() > 0)
-    new_balloon->set_offset(balloons_[balloons_.size() - 1]->offset());
+  int count = base_.count();
+  if (count > 0)
+    new_balloon->set_offset(base_.balloons()[count - 1]->offset());
 #endif
-  balloons_.push_back(new_balloon);
+  base_.Add(new_balloon);
   PositionBalloons(false);
 
   // There may be no listener in a unit test.
   if (space_change_listener_)
     space_change_listener_->OnBalloonSpaceChanged();
 
   // This is used only for testing.
   if (on_collection_changed_callback_.get())
     on_collection_changed_callback_->Run();
 }
 
-bool BalloonCollectionImpl::Remove(const Notification& notification) {
-  Balloons::iterator iter;
-  for (iter = balloons_.begin(); iter != balloons_.end(); ++iter) {
-    if (notification.IsSame((*iter)->notification())) {
-      // Balloon.CloseByScript() will cause OnBalloonClosed() to be called on
-      // this object, which will remove it from the collection and free it.
-      (*iter)->CloseByScript();
-      return true;
-    }
-  }
-  return false;
+bool BalloonCollectionImpl::RemoveById(const std::string& id) {
+  return base_.CloseById(id);
+}
+
+bool BalloonCollectionImpl::RemoveBySourceOrigin(const GURL& origin) {
+  return base_.CloseAllBySourceOrigin(origin);
 }
 
 bool BalloonCollectionImpl::HasSpace() const {
-  if (count() < kMinAllowedBalloonCount)
+  int count = base_.count();
+  if (count < kMinAllowedBalloonCount)
     return true;
 
   int max_balloon_size = 0;
   int total_size = 0;
   layout_.GetMaxLinearSize(&max_balloon_size, &total_size);
 
-  int current_max_size = max_balloon_size * count();
+  int current_max_size = max_balloon_size * count;
   int max_allowed_size = static_cast<int>(total_size *
                                           kPercentBalloonFillFactor);
   return current_max_size < max_allowed_size - max_balloon_size;
 }
 
 void BalloonCollectionImpl::ResizeBalloon(Balloon* balloon,
                                           const gfx::Size& size) {
   balloon->set_content_size(Layout::ConstrainToSizeLimits(size));
   PositionBalloons(true);
 }
 
 void BalloonCollectionImpl::DisplayChanged() {
   layout_.RefreshSystemMetrics();
   PositionBalloons(true);
 }
 
 void BalloonCollectionImpl::OnBalloonClosed(Balloon* source) {
   // We want to free the balloon when finished.
-  scoped_ptr<Balloon> closed(source);
-  Balloons::iterator it = balloons_.begin();
+  const Balloons& balloons = base_.balloons();
+  Balloons::const_iterator it = balloons.begin();
 
 #if USE_OFFSETS
   gfx::Point offset;
   bool apply_offset = false;
-  while (it != balloons_.end()) {
+  while (it != balloons.end()) {
     if (*it == source) {
-      it = balloons_.erase(it);
-      if (it != balloons_.end()) {
+      ++it;
+      if (it != balloons.end()) {
         apply_offset = true;
         offset.set_y((source)->offset().y() - (*it)->offset().y() +
             (*it)->content_size().height() - source->content_size().height());
       }
     } else {
       if (apply_offset)
         (*it)->add_offset(offset);
       ++it;
     }
   }
   // Start listening for UI events so we cancel the offset when the mouse
   // leaves the balloon area.
   if (apply_offset)
     AddMessageLoopObserver();
-#else
-  for (; it != balloons_.end(); ++it) {
-    if (*it == source) {
-      balloons_.erase(it);
-      break;
-    }
-  }
 #endif
 
+  base_.Remove(source);
   PositionBalloons(true);
 
   // There may be no listener in a unit test.
   if (space_change_listener_)
     space_change_listener_->OnBalloonSpaceChanged();
 
   // This is used only for testing.
   if (on_collection_changed_callback_.get())
     on_collection_changed_callback_->Run();
 }
 
 void BalloonCollectionImpl::PositionBalloonsInternal(bool reposition) {
+  const Balloons& balloons = base_.balloons();
+
   layout_.RefreshSystemMetrics();
   gfx::Point origin = layout_.GetLayoutOrigin();
-  for (Balloons::iterator it = balloons_.begin(); it != balloons_.end(); ++it) {
+  for (Balloons::const_iterator it = balloons.begin();
+       it != balloons.end();
+       ++it) {
     gfx::Point upper_left = layout_.NextPosition((*it)->GetViewSize(), &origin);
     (*it)->SetPosition(upper_left, reposition);
   }
 }
 
 #if USE_OFFSETS
 void BalloonCollectionImpl::AddMessageLoopObserver() {
   if (!added_as_message_loop_observer_) {
     MessageLoopForUI::current()->AddObserver(this);
     added_as_message_loop_observer_ = true;
   }
 }
 
 void BalloonCollectionImpl::RemoveMessageLoopObserver() {
   if (added_as_message_loop_observer_) {
     MessageLoopForUI::current()->RemoveObserver(this);
     added_as_message_loop_observer_ = false;
   }
 }
 
 void BalloonCollectionImpl::CancelOffsets() {
   reposition_factory_.RevokeAll();
 
   // Unhook from listening to all UI events.
   RemoveMessageLoopObserver();
 
-  for (Balloons::iterator it = balloons_.begin(); it != balloons_.end(); ++it)
+  const Balloons& balloons = base_.balloons();
+  for (Balloons::const_iterator it = balloons.begin();
+       it != balloons.end();
+       ++it)
     (*it)->set_offset(gfx::Point(0, 0));
 
   PositionBalloons(true);
 }
 
 void BalloonCollectionImpl::HandleMouseMoveEvent() {
   if (!IsCursorInBalloonCollection()) {
     // Mouse has left the region.  Schedule a reposition after
     // a short delay.
     if (reposition_factory_.empty()) {
@@ skipping 117 matching lines @@
   gfx::Rect new_work_area = info_provider->GetPrimaryMonitorWorkArea();
 #endif
   if (!work_area_.Equals(new_work_area)) {
     work_area_.SetRect(new_work_area.x(), new_work_area.y(),
                        new_work_area.width(), new_work_area.height());
     changed = true;
   }
 
   return changed;
 }