Use shared NotificationControlButtonsView for non-arc notification buttons

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 7fa691aff2549c245c7e95f39f5ad3b8b060deb5..2621712f3f35e0ede92a5469dcfe0361b8353ec0 100644
--- a/ui/message_center/views/notification_view.h
+++ b/ui/message_center/views/notification_view.h
@@ -25,6 +25,7 @@ namespace message_center {
 class BoundedLabel;
 class NotificationButton;
 class ProportionalImageView;
+class NotificationControlButtonsView;

[yhanada, 2017/07/05 04:40:22]

Don't we need to sort the declarations?

[yoshiki, 2017/07/05 06:48:32]

Done.

 
 // View that displays all current types of notification (web, basic, image, and
 // list) except the custom notification. Future notification types may be
@@ -57,9 +58,6 @@ class MESSAGE_CENTER_EXPORT NotificationView
   void RequestFocusOnCloseButton() override;
   void UpdateControlButtonsVisibility() override;
 
- protected:
-  views::ImageButton* close_button() { return close_button_.get(); }
-
  private:
   FRIEND_TEST_ALL_PREFIXES(NotificationViewTest, CreateOrUpdateTest);
   FRIEND_TEST_ALL_PREFIXES(NotificationViewTest,
@@ -74,9 +72,6 @@ class MESSAGE_CENTER_EXPORT NotificationView
 
   friend class NotificationViewTest;
 
-  // views::ViewTargeterDelegate:
-  views::View* TargetForRect(views::View* root, const gfx::Rect& rect) override;
-
   void CreateOrUpdateViews(const Notification& notification);
 
   void CreateOrUpdateTitleView(const Notification& notification);
@@ -108,7 +103,6 @@ class MESSAGE_CENTER_EXPORT NotificationView
   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_ = nullptr;
   views::View* bottom_view_ = nullptr;
@@ -117,8 +111,8 @@ class MESSAGE_CENTER_EXPORT NotificationView
   views::ProgressBar* progress_bar_view_ = nullptr;
   std::vector<NotificationButton*> action_buttons_;
   std::vector<views::View*> separators_;
-  std::unique_ptr<views::ImageButton> close_button_ = nullptr;
   std::unique_ptr<views::ImageView> small_image_view_;
+  NotificationControlButtonsView* control_buttons_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationView);
 };