Remove Notifications Associated with an Extension When the Extension is Unchecked from the Message …

ui/message_center/message_center_impl.cc

 // Copyright (c) 2013 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 "ui/message_center/message_center_impl.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
@@ skipping 410 matching lines @@
 // MessageCenterImpl
 
 MessageCenterImpl::MessageCenterImpl()
     : MessageCenter(),
       popup_timers_controller_(new internal::PopupTimersController(this)),
       settings_provider_(NULL) {
   notification_list_.reset(new NotificationList());
   notification_queue_.reset(new internal::ChangeQueue());
 }
 
-MessageCenterImpl::~MessageCenterImpl() {}
+MessageCenterImpl::~MessageCenterImpl() {
+  SetNotifierSettingsProvider(NULL);
+}
 
 void MessageCenterImpl::AddObserver(MessageCenterObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void MessageCenterImpl::RemoveObserver(MessageCenterObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void MessageCenterImpl::AddNotificationBlocker(NotificationBlocker* blocker) {
@@ skipping 31 matching lines @@
                       observer_list_,
                       OnNotificationUpdated(*iter));
   }
   notification_cache_.Rebuild(
       notification_list_->GetVisibleNotifications(blockers_));
   FOR_EACH_OBSERVER(MessageCenterObserver,
                     observer_list_,
                     OnBlockingStateChanged(blocker));
 }
 
+void MessageCenterImpl::UpdateIconImage(
+  const NotifierId& notifier_id,const gfx::Image& icon) {}
+
+void MessageCenterImpl::NotifierGroupChanged() {}
+
+void MessageCenterImpl::NotifierEnabledChanged(
+  const NotifierId& notifier_id, bool enabled) {
+  if (!enabled) {
+    RemoveNotificationsForNotifierId(notifier_id);
+  }
+}
+
 void MessageCenterImpl::SetVisibility(Visibility visibility) {
   std::set<std::string> updated_ids;
   notification_list_->SetMessageCenterVisible(
       (visibility == VISIBILITY_MESSAGE_CENTER), &updated_ids);
   notification_cache_.RecountUnread();
 
   for (std::set<std::string>::const_iterator iter = updated_ids.begin();
        iter != updated_ids.end();
        ++iter) {
     FOR_EACH_OBSERVER(
@@ skipping 150 matching lines @@
     delegate->Close(by_user);
 
   notification_list_->RemoveNotification(copied_id);
   notification_cache_.Rebuild(
       notification_list_->GetVisibleNotifications(blockers_));
   FOR_EACH_OBSERVER(MessageCenterObserver,
                     observer_list_,
                     OnNotificationRemoved(copied_id, by_user));
 }
 
+void MessageCenterImpl::RemoveNotificationsForNotifierId(
+    const NotifierId& notifier_id) {
+  NotificationList::Notifications notifications =
+      notification_list_->GetNotificationsByNotifierId(notifier_id);
+  for (NotificationList::Notifications::const_iterator iter =
+           notifications.begin(); iter != notifications.end(); ++iter) {
+    RemoveNotification((*iter)->id(), false);
+  }
+  if (!notifications.empty()) {
+    notification_cache_.Rebuild(
+        notification_list_->GetVisibleNotifications(blockers_));
+  }
+}
+
 void MessageCenterImpl::RemoveAllNotifications(bool by_user) {
   // Using not |blockers_| but an empty list since it wants to remove literally
   // all notifications.
   RemoveNotifications(by_user, NotificationBlockers());
 }
 
 void MessageCenterImpl::RemoveAllVisibleNotifications(bool by_user) {
   RemoveNotifications(by_user, blockers_);
 }
 
@@ skipping 82 matching lines @@
                       OnNotificationUpdated(notification_id));
   }
 }
 
 void MessageCenterImpl::DisableNotificationsByNotifier(
     const NotifierId& notifier_id) {
   if (settings_provider_) {
     // TODO(mukai): SetNotifierEnabled can just accept notifier_id?
     Notifier notifier(notifier_id, base::string16(), true);
     settings_provider_->SetNotifierEnabled(notifier, false);
-  }
-
-  NotificationList::Notifications notifications =
-      notification_list_->GetNotificationsByNotifierId(notifier_id);
-  for (NotificationList::Notifications::const_iterator iter =
-           notifications.begin(); iter != notifications.end();) {
-    std::string id = (*iter)->id();
-    iter++;
-    RemoveNotification(id, false);
-  }
-  if (!notifications.empty()) {
-    notification_cache_.Rebuild(
-        notification_list_->GetVisibleNotifications(blockers_));
+    // The settings provider will call back to remove the notifications
+    // belonging to the notifier id.
+  } else {
+    RemoveNotificationsForNotifierId(notifier_id);
   }
 }
 
 void MessageCenterImpl::ClickOnNotification(const std::string& id) {
   if (!HasNotification(id))
     return;
   if (HasPopupNotifications())
     MarkSinglePopupAsShown(id, true);
   scoped_refptr<NotificationDelegate> delegate =
       notification_list_->GetNotificationDelegate(id);
@@ skipping 42 matching lines @@
   if (delegate.get())
     delegate->Display();
   FOR_EACH_OBSERVER(
       MessageCenterObserver,
       observer_list_,
       OnNotificationDisplayed(id, source));
 }
 
 void MessageCenterImpl::SetNotifierSettingsProvider(
     NotifierSettingsProvider* provider) {
+  if (settings_provider_) {
+    settings_provider_->RemoveObserver(this);
+    settings_provider_ = NULL;
+  }
   settings_provider_ = provider;
+  if (settings_provider_)
+    settings_provider_->AddObserver(this);
 }
 
 NotifierSettingsProvider* MessageCenterImpl::GetNotifierSettingsProvider() {
   return settings_provider_;
 }
 
 void MessageCenterImpl::SetQuietMode(bool in_quiet_mode) {
   if (in_quiet_mode != notification_list_->quiet_mode()) {
     notification_list_->SetQuietMode(in_quiet_mode);
     FOR_EACH_OBSERVER(MessageCenterObserver,
@@ skipping 31 matching lines @@
 void MessageCenterImpl::PausePopupTimers() {
   if (popup_timers_controller_.get())
     popup_timers_controller_->PauseAll();
 }
 
 void MessageCenterImpl::DisableTimersForTest() {
   popup_timers_controller_.reset();
 }
 
 }  // namespace message_center