Move close button to 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 5856899ccedd866ce92e4113aa837f7191d6561b..304475a3fb85e7fb2762ddad06181e76b0399b08 100644
--- a/ui/message_center/views/notification_view.h
+++ b/ui/message_center/views/notification_view.h
@@ -60,9 +60,6 @@ class MESSAGE_CENTER_EXPORT NotificationView
   // Overridden from MessageView:
   void UpdateWithNotification(const Notification& notification) override;
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-  bool IsCloseButtonFocused() override;
-  void RequestFocusOnCloseButton() override;
-  bool IsPinned() override;
 
  protected:
   NotificationView(MessageCenterController* controller,
@@ -97,7 +94,6 @@ class MESSAGE_CENTER_EXPORT NotificationView
   void CreateOrUpdateIconView(const Notification& notification);
   void CreateOrUpdateImageView(const Notification& notification);
   void CreateOrUpdateActionButtonViews(const Notification& notification);
-  void CreateOrUpdateCloseButtonView(const Notification& notification);
 
   int GetMessageLineLimit(int title_lines, int width) const;
   int GetMessageHeight(int width, int limit) const;
@@ -112,19 +108,18 @@ class MESSAGE_CENTER_EXPORT NotificationView
   bool clickable_;
 
   // Weak references to NotificationView descendants owned by their parents.
-  views::View* top_view_;
-  BoundedLabel* title_view_;
-  BoundedLabel* message_view_;
-  BoundedLabel* context_message_view_;
-  views::ImageButton* settings_button_view_;
+  views::View* top_view_ = nullptr;
+  BoundedLabel* title_view_ = nullptr;
+  BoundedLabel* message_view_ = nullptr;
+  BoundedLabel* context_message_view_ = nullptr;
+  views::ImageButton* settings_button_view_ = nullptr;
   std::vector<views::View*> item_views_;
-  ProportionalImageView* icon_view_;
-  views::View* bottom_view_;
-  views::View* image_container_;
-  ProportionalImageView* image_view_;
-  NotificationProgressBarBase* progress_bar_view_;
+  ProportionalImageView* icon_view_ = nullptr;
+  views::View* bottom_view_ = nullptr;
+  views::View* image_container_ = nullptr;
+  ProportionalImageView* image_view_ = nullptr;
+  NotificationProgressBarBase* progress_bar_view_ = nullptr;
   std::vector<NotificationButton*> action_buttons_;
-  std::unique_ptr<views::ImageButton> close_button_;
   std::vector<views::View*> separators_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationView);