Move knowledge about MessageCenter out of MessageView.

ui/message_center/views/message_center_view.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/views/message_center_view.h"
 
 #include <list>
 #include <map>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 870 matching lines @@
     }
     if (message_views_.size() >= kMaxVisibleMessageCenterNotifications)
       break;
   }
   NotificationsChanged();
 }
 
 void MessageCenterView::OnNotificationRemoved(const std::string& id,
                                               bool by_user) {
   for (size_t i = 0; i < message_views_.size(); ++i) {
-    if (message_views_[i]->notification_id() == id) {
+    MessageView* message_view = message_views_[i];
+    if (message_view->GetType() == NOTIFICATION_VIEW &&
+        static_cast<NotificationView*>(message_view)->notification_id() == id) {

[dewittj, 2013/11/19 01:44:04]

static_cast? Any way to get around this?

       if (by_user) {
         message_list_view_->SetRepositionTarget(message_views_[i]->bounds());
         // Moves the keyboard focus to the next notification if the removed
         // notification is focused so that the user can dismiss notifications
         // without re-focusing by tab key.
         if (message_views_.size() > 1) {
           views::View* focused_view = GetFocusManager()->GetFocusedView();
           if (message_views_[i]->IsCloseButtonFocused() ||
               focused_view == message_views_[i]) {
             size_t next_index = i + 1;
@@ skipping 15 matching lines @@
 }
 
 void MessageCenterView::OnNotificationUpdated(const std::string& id) {
   const NotificationList::Notifications& notifications =
       message_center_->GetVisibleNotifications();
   size_t index = 0;
   for (NotificationList::Notifications::const_iterator iter =
            notifications.begin();
        iter != notifications.end() && index < message_views_.size();
        ++iter, ++index) {
-    DCHECK((*iter)->id() == message_views_[index]->notification_id());
+    // TODO(dimich): This fails if there are GROUP_VIEWs around,
+    // they break the iter/index sync which is assumed here.
+    DCHECK(message_views_[index]->GetType() != NOTIFICATION_VIEW ||
+        (*iter)->id() == static_cast<NotificationView*>(
+            message_views_[index])->notification_id());
     if ((*iter)->id() == id) {
       bool expanded = true;
       if (IsExperimentalNotificationUIEnabled())
         expanded = (*iter)->is_expanded();
       MessageView* view =
           NotificationView::Create(*(*iter),
                                    message_center_,
                                    tray_,
                                    expanded,
                                    false); // Not creating a top-level
@@ skipping 80 matching lines @@
   scroller_->InvalidateLayout();
   PreferredSizeChanged();
   Layout();
 }
 
 void MessageCenterView::SetNotificationViewForTest(views::View* view) {
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center