Consolidate to use MessageView

ui/message_center/views/notification_view.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/views/notification_view.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 132 matching lines @@
     child_at(i)->SetVisible(visible);
 }
 
 }  // namespace
 
 namespace message_center {
 
 // NotificationView ////////////////////////////////////////////////////////////
 
 // static
-NotificationView* NotificationView::Create(MessageCenterController* controller,
-                                           const Notification& notification,
-                                           bool top_level) {
+MessageView* NotificationView::Create(MessageCenterController* controller,
+                                      const Notification& notification,
+                                      bool top_level) {
   switch (notification.type()) {
     case NOTIFICATION_TYPE_BASE_FORMAT:
     case NOTIFICATION_TYPE_IMAGE:
     case NOTIFICATION_TYPE_MULTIPLE:
     case NOTIFICATION_TYPE_SIMPLE:
     case NOTIFICATION_TYPE_PROGRESS:
       break;
     default:
       // If the caller asks for an unrecognized kind of view (entirely possible
       // if an application is running on an older version of this code that
@@ skipping 76 matching lines @@
   for (size_t i = 0; i < items.size() && i < kNotificationMaximumItems; ++i) {
     accessible_lines.push_back(items[i].title + base::ASCIIToUTF16(" ") +
                                items[i].message);
   }
   set_accessible_name(
       base::JoinString(accessible_lines, base::ASCIIToUTF16("\n")));
 }
 
 NotificationView::NotificationView(MessageCenterController* controller,
                                    const Notification& notification)
-    : MessageView(this,
+    : MessageView(controller,
                   notification.id(),
                   notification.notifier_id(),
                   notification.small_image().AsImageSkia(),
                   notification.display_source()),
-      controller_(controller),
       clickable_(notification.clickable()),
       top_view_(NULL),
       title_view_(NULL),
       message_view_(NULL),
       context_message_view_(NULL),
       settings_button_view_(NULL),
       icon_view_(NULL),
       bottom_view_(NULL),
       image_container_(NULL),
       image_view_(NULL),
@@ skipping 128 matching lines @@
   ScrollRectToVisible(GetLocalBounds());
 }
 
 void NotificationView::ScrollRectToVisible(const gfx::Rect& rect) {
   // Notification want to show the whole notification when a part of it (like
   // a button) gets focused.
   views::View::ScrollRectToVisible(GetLocalBounds());
 }
 
 gfx::NativeCursor NotificationView::GetCursor(const ui::MouseEvent& event) {
-  if (!clickable_ || !controller_->HasClickedListener(notification_id()))
+  if (!clickable_ || !controller()->HasClickedListener(notification_id()))
     return views::View::GetCursor(event);
 
   return views::GetNativeHandCursor();
 }
 
 void NotificationView::UpdateWithNotification(
     const Notification& notification) {
   MessageView::UpdateWithNotification(notification);
 
   CreateOrUpdateViews(notification);
   SetAccessibleName(notification);
   Layout();
   SchedulePaint();
 }
 
 void NotificationView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   // Certain operations can cause |this| to be destructed, so copy the members
   // we send to other parts of the code.
   // TODO(dewittj): Remove this hack.
   std::string id(notification_id());
 
   if (sender == settings_button_view_) {
-    controller_->ClickOnSettingsButton(id);
+    controller()->ClickOnSettingsButton(id);
     return;
   }
 
   // See if the button pressed was an action button.
   for (size_t i = 0; i < action_buttons_.size(); ++i) {
     if (sender == action_buttons_[i]) {
-      controller_->ClickOnNotificationButton(id, i);
+      controller()->ClickOnNotificationButton(id, i);
       return;
     }
   }
 
   if (close_button_ && sender == close_button_.get()) {
-    controller_->RemoveNotification(notification_id(), true);  // By user.
+    controller()->RemoveNotification(notification_id(), true);  // By user.
   }
 
   // Let the superclass handle everything else.
   // Warning: This may cause the NotificationView itself to be deleted,
   // so don't do anything afterwards.
   MessageView::ButtonPressed(sender, event);
 }
 
-void NotificationView::ClickOnNotification(const std::string& notification_id) {
-  controller_->ClickOnNotification(notification_id);
-}
-
-void NotificationView::RemoveNotification(const std::string& notification_id,
-                                          bool by_user) {
-  controller_->RemoveNotification(notification_id, by_user);
-}
-
 void NotificationView::CreateOrUpdateTitleView(
     const Notification& notification) {
   if (notification.title().empty()) {
     if (title_view_) {
       // Deletion will also remove |title_view_| from its parent.
       delete title_view_;
       title_view_ = NULL;
     }
     return;
   }
@@ skipping 369 matching lines @@
 void NotificationView::RequestFocusOnCloseButton() {
   if (close_button_)
     close_button_->RequestFocus();
 }
 
 bool NotificationView::IsPinned() {
   return !close_button_;
 }
 
 }  // namespace message_center