Consolidate to use 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/macros.h"
@@ skipping 407 matching lines @@
       break;
   }
   NotificationsChanged();
 }
 
 void MessageCenterView::OnNotificationRemoved(const std::string& id,
                                               bool by_user) {
   NotificationViewsMap::iterator view_iter = notification_views_.find(id);
   if (view_iter == notification_views_.end())
     return;
-  NotificationView* view = view_iter->second;
+  MessageView* view = view_iter->second;
   int index = message_list_view_->GetIndexOf(view);
   DCHECK_LE(0, index);
   if (by_user) {
     message_list_view_->SetRepositionTarget(view->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 (view->IsCloseButtonFocused() ||
         view == GetFocusManager()->GetFocusedView()) {
       views::View* next_focused_view = NULL;
@@ skipping 21 matching lines @@
 void MessageCenterView::OnNotificationUpdated(const std::string& id) {
   NotificationViewsMap::const_iterator view_iter = notification_views_.find(id);
   if (view_iter == notification_views_.end())
     return;
 
   // Set the item on the mouse cursor as the reposition target so that it
   // should stick to the current position over the update.
   bool set = false;
   if (message_list_view_->IsMouseHovered()) {
     for (const auto& hover_id_view : notification_views_) {
-      NotificationView* hover_view = hover_id_view.second;
+      MessageView* hover_view = hover_id_view.second;
       if (hover_view->IsMouseHovered()) {
         message_list_view_->SetRepositionTarget(hover_view->bounds());
         set = true;
         break;
       }
     }
   }
   if (!set)
     message_list_view_->ResetRepositionSession();
 
   // TODO(dimich): add MessageCenter::GetVisibleNotificationById(id)
-  NotificationView* view = view_iter->second;
+  MessageView* view = view_iter->second;
   const NotificationList::Notifications& notifications =
       message_center_->GetVisibleNotifications();
   for (NotificationList::Notifications::const_iterator iter =
            notifications.begin(); iter != notifications.end(); ++iter) {
     if ((*iter)->id() == id) {
       int old_width = view->width();
       int old_height = view->GetHeightForWidth(old_width);
       message_list_view_->UpdateNotification(view, **iter);
       if (view->GetHeightForWidth(old_width) != old_height)
         NotificationsChanged();
@@ skipping 68 matching lines @@
   }
 }
 
 void MessageCenterView::AnimationCanceled(const gfx::Animation* animation) {
   DCHECK_EQ(animation, settings_transition_animation_.get());
   AnimationEnded(animation);
 }
 
 void MessageCenterView::AddNotificationAt(const Notification& notification,
                                           int index) {
-  NotificationView* view =
+  MessageView* view =
       NotificationView::Create(this, notification, false);  // Not top-level.
   view->set_context_menu_controller(context_menu_controller_.get());
   notification_views_[notification.id()] = view;
   view->set_scroller(scroller_);
   message_list_view_->AddNotificationAt(view, index);
 }
 
 void MessageCenterView::NotificationsChanged() {
   bool no_message_views = notification_views_.empty();
 
@@ skipping 36 matching lines @@
   scroller_->InvalidateLayout();
   PreferredSizeChanged();
   Layout();
 }
 
 void MessageCenterView::SetNotificationViewForTest(MessageView* view) {
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center