Consolidate to use MessageView

ui/message_center/views/notification_view.h

Index: ui/message_center/views/notification_view.h
diff --git a/ui/message_center/views/notification_view.h b/ui/message_center/views/notification_view.h
index 5820ea5bbef9770985ba4e6d2c9d7f7e30521062..5856899ccedd866ce92e4113aa837f7191d6561b 100644
--- a/ui/message_center/views/notification_view.h
+++ b/ui/message_center/views/notification_view.h
@@ -23,7 +23,6 @@ namespace message_center {
 
 class BoundedLabel;
 class MessageCenter;
-class MessageCenterController;
 class NotificationButton;
 class NotificationProgressBarBase;
 class NotificationView;
@@ -36,8 +35,7 @@ class ProportionalImageView;
 // method below.
 class MESSAGE_CENTER_EXPORT NotificationView
     : public MessageView,
-      public views::ViewTargeterDelegate,
-      public MessageViewController {
+      public views::ViewTargeterDelegate {
  public:
   // Creates appropriate MessageViews for notifications. Those currently are
   // always NotificationView instances but in the future
@@ -46,9 +44,9 @@ class MESSAGE_CENTER_EXPORT NotificationView
   // outside the browser window. No custom shadows are created for top level
   // notifications on Linux with Aura.
   // |controller| may be NULL, but has to be set before the view is shown.
-  static NotificationView* Create(MessageCenterController* controller,
-                                  const Notification& notification,
-                                  bool top_level);
+  static MessageView* Create(MessageCenterController* controller,

[dewittj, 2016/05/13 20:24:32]

Is there a reason to return a MessageView here?

[xiyuan, 2016/05/13 21:07:39]

Yes. The incoming CustomNotificationView will be created here and it is derived
from MessageView. MessageView is what this function returned before we fold
everything into NotificationView. This cl brings that back.

+                             const Notification& notification,
+                             bool top_level);
   ~NotificationView() override;
 
   // Overridden from views::View:
@@ -66,15 +64,6 @@ class MESSAGE_CENTER_EXPORT NotificationView
   void RequestFocusOnCloseButton() override;
   bool IsPinned() override;
 
-  // Overridden from MessageViewController:
-  void ClickOnNotification(const std::string& notification_id) override;
-  void RemoveNotification(const std::string& notification_id,
-                          bool by_user) override;
-
-  void set_controller(MessageCenterController* controller) {
-    controller_ = controller;
-  }
-
  protected:
   NotificationView(MessageCenterController* controller,
                    const Notification& notification);
@@ -119,8 +108,6 @@ class MESSAGE_CENTER_EXPORT NotificationView
   // notification.
   base::string16 FormatContextMessage(const Notification& notification) const;
 
-  MessageCenterController* controller_;  // Weak, lives longer then views.
-
   // Describes whether the view should display a hand pointer or not.
   bool clickable_;