Consolidate to use MessageView

ui/message_center/views/message_view.h

 // 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.
 
 #ifndef UI_MESSAGE_CENTER_VIEWS_MESSAGE_VIEW_H_
 #define UI_MESSAGE_CENTER_VIEWS_MESSAGE_VIEW_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 14 matching lines @@
 
 namespace views {
 class ImageButton;
 class ImageView;
 class Painter;
 class ScrollView;
 }
 
 namespace message_center {
 
-// Interface that MessageView uses to report clicks and other user actions.
-// Provided by creator of MessageView.
-class MessageViewController {
- public:
-  virtual void ClickOnNotification(const std::string& notification_id) = 0;
-  virtual void RemoveNotification(const std::string& notification_id,
-                                  bool by_user) = 0;
-};
+class MessageCenterController;
 
 // Individual notifications constants.
 const int kPaddingBetweenItems = 10;
 const int kPaddingHorizontal = 18;
 const int kWebNotificationButtonWidth = 32;
 const int kWebNotificationIconSize = 40;
 
 // An base class for a notification entry. Contains background and other
 // elements shared by derived notification views.
 class MESSAGE_CENTER_EXPORT MessageView : public views::SlideOutView,
                                           public views::ButtonListener {
  public:
-  MessageView(MessageViewController* controller,
+  MessageView(MessageCenterController* controller,
               const std::string& notification_id,
               const NotifierId& notifier_id,
               const gfx::ImageSkia& small_image,
               const base::string16& display_source);
   ~MessageView() override;
 
   // Updates this view with the new data contained in the notification.
   virtual void UpdateWithNotification(const Notification& notification);
 
   // Returns the insets for the shadow it will have for rich notification.
@@ skipping 24 matching lines @@
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Overridden from ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   void set_scroller(views::ScrollView* scroller) { scroller_ = scroller; }
   std::string notification_id() { return notification_id_; }
   NotifierId notifier_id() { return notifier_id_; }
   const base::string16& display_source() const { return display_source_; }
 
+  void set_controller(MessageCenterController* controller) {
+    controller_ = controller;
+  }
+
  protected:
   // Overridden from views::SlideOutView:
   void OnSlideOut() override;
 
   views::ImageView* small_image() { return small_image_view_.get(); }
   views::ScrollView* scroller() { return scroller_; }
+  MessageCenterController* controller() { return controller_; }
 
  private:
-  MessageViewController* controller_;
+  MessageCenterController* controller_;  // Weak, lives longer then views.
   std::string notification_id_;
   NotifierId notifier_id_;
   views::View* background_view_;  // Owned by views hierarchy.
   std::unique_ptr<views::ImageView> small_image_view_;
   views::ScrollView* scroller_;
 
   base::string16 accessible_name_;
 
   base::string16 display_source_;
 
   std::unique_ptr<views::Painter> focus_painter_;
 
   // Changes the background color being used by |background_view_| and schedules
   // a paint.
   void SetDrawBackgroundAsActive(bool active);
 
   DISALLOW_COPY_AND_ASSIGN(MessageView);
 };
 
 }  // namespace message_center
 
 #endif // UI_MESSAGE_CENTER_VIEWS_MESSAGE_VIEW_H_