Move close button to 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 28 matching lines @@
 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(MessageCenterController* controller,
-              const std::string& notification_id,
-              const NotifierId& notifier_id,
-              const gfx::ImageSkia& small_image,
-              const base::string16& display_source);
+              const Notification& notification);
   ~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.
   static gfx::Insets GetShadowInsets();
 
   // Creates a shadow around the notification.
   void CreateShadowBorder();
 
-  virtual bool IsCloseButtonFocused();
-  virtual void RequestFocusOnCloseButton();
-  virtual bool IsPinned();
+  bool IsCloseButtonFocused();
+  void RequestFocusOnCloseButton();
+  bool IsPinned();
 
   void set_accessible_name(const base::string16& accessible_name) {
     accessible_name_ = accessible_name;
   }
 
   // Overridden from views::View:
   void GetAccessibleState(ui::AXViewState* state) override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
   bool OnKeyReleased(const ui::KeyEvent& event) override;
@@ skipping 14 matching lines @@
   const base::string16& display_source() const { return display_source_; }
 
   void set_controller(MessageCenterController* controller) {
     controller_ = controller;
   }
 
  protected:
   // Overridden from views::SlideOutView:
   void OnSlideOut() override;
 
+  // Creates and add close button to view hierarchy when necessary. Derived
+  // classes should call this after its view hierarchy is populated to ensure
+  // it is on top of other views.
+  void CreateOrUpdateCloseButtonView(const Notification& notification);
+
   views::ImageView* small_image() { return small_image_view_.get(); }
+  views::ImageButton* close_button() { return close_button_.get(); }
   views::ScrollView* scroller() { return scroller_; }
   MessageCenterController* controller() { return controller_; }
 
  private:
+  // Changes the background color being used by |background_view_| and schedules
+  // a paint.
+  void SetDrawBackgroundAsActive(bool active);
+
   MessageCenterController* controller_;  // Weak, lives longer then views.
   std::string notification_id_;
   NotifierId notifier_id_;
-  views::View* background_view_;  // Owned by views hierarchy.
+  views::View* background_view_ = nullptr;  // Owned by views hierarchy.
   std::unique_ptr<views::ImageView> small_image_view_;
-  views::ScrollView* scroller_;
+  std::unique_ptr<views::ImageButton> close_button_;
+  views::ScrollView* scroller_ = nullptr;
 
   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_