Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/passwords/manage_password_items_view.cc

Index: chrome/browser/ui/views/passwords/manage_password_items_view.cc
diff --git a/chrome/browser/ui/views/passwords/manage_password_items_view.cc b/chrome/browser/ui/views/passwords/manage_password_items_view.cc
index 8443799ace65850a97f9c961c84770ea61e63eef..dddcf5759e51951dbe11496a38d19e0fb6669cb6 100644
--- a/chrome/browser/ui/views/passwords/manage_password_items_view.cc
+++ b/chrome/browser/ui/views/passwords/manage_password_items_view.cc
@@ -15,7 +15,6 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
@@ -94,7 +93,7 @@ std::unique_ptr<views::Label> GeneratePasswordLabel(
 }
 
 std::unique_ptr<views::ImageButton> GenerateDeleteButton(
-    views::ButtonListener* listener) {
+    views::ImageButtonDelegate* listener) {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   std::unique_ptr<views::ImageButton> button(new views::ImageButton(listener));
   button->SetImage(views::ImageButton::STATE_NORMAL,
@@ -133,8 +132,9 @@ std::unique_ptr<views::Link> GenerateUndoLink(views::LinkListener* listener) {
 
 // Manage credentials: stores credentials state and adds proper row to layout
 // based on credential state.
-class ManagePasswordItemsView::PasswordFormRow : public views::ButtonListener,
-                                                 public views::LinkListener {
+class ManagePasswordItemsView::PasswordFormRow
+    : public views::ImageButtonDelegate,
+      public views::LinkListener {
  public:
   PasswordFormRow(ManagePasswordItemsView* host,
                   const autofill::PasswordForm* password_form,
@@ -153,7 +153,7 @@ class ManagePasswordItemsView::PasswordFormRow : public views::ButtonListener,
   void AddCredentialsRow(views::GridLayout* layout);
   void AddUndoRow(views::GridLayout* layout);
 
-  // views::ButtonListener:
+  // views::ImageButtonDelegate:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
   // views::LinkListener:
   void LinkClicked(views::Link* source, int event_flags) override;