Pass Notification into NotificationBlocker ShouldShow* methods

ui/message_center/notification_list.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 "ui/message_center/notification_list.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "ui/gfx/image/image.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_blocker.h"
 #include "ui/message_center/notification_types.h"
 
 namespace message_center {
 
 namespace {
 
 bool ShouldShowNotificationAsPopup(
     const Notification& notification,
     const NotificationBlockers& blockers) {
   for (size_t i = 0; i < blockers.size(); ++i) {
-    if (!blockers[i]->ShouldShowNotificationAsPopup(notification.notifier_id()))
+    if (!blockers[i]->ShouldShowNotificationAsPopup(notification))
       return false;
   }
   return true;
 }
 
 }  // namespace
 
 bool ComparePriorityTimestampSerial::operator()(Notification* n1,
                                                 Notification* n2) {
   if (n1->priority() > n2->priority())  // Higher pri go first.
@@ skipping 233 matching lines @@
   return NULL;
 }
 
 NotificationList::Notifications NotificationList::GetVisibleNotifications(
     const NotificationBlockers& blockers) const {
   Notifications result;
   for (Notifications::const_iterator iter = notifications_.begin();
        iter != notifications_.end(); ++iter) {
     bool should_show = true;
     for (size_t i = 0; i < blockers.size(); ++i) {
-      if (!blockers[i]->ShouldShowNotification((*iter)->notifier_id())) {
+      if (!blockers[i]->ShouldShowNotification(**iter)) {
         should_show = false;
         break;
       }
     }
     if (should_show)
       result.insert(*iter);
   }
 
   return result;
 }
@@ skipping 49 matching lines @@
     notification->set_shown_as_popup(message_center_->IsMessageCenterVisible()
                                      || quiet_mode_
                                      || notification->shown_as_popup());
   }
   // Take ownership. The notification can only be removed from the list
   // in EraseNotification(), which will delete it.
   notifications_.insert(notification.release());
 }
 
 }  // namespace message_center