Add VectorIconButton functionality to ImageButton.

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

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/views/passwords/manage_password_items_view.h"
 
 #include <numeric>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/grit/generated_resources.h"
 #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"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
 namespace {
 
@@ skipping 58 matching lines @@
   std::unique_ptr<views::Label> label(new views::Label(text));
   label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::SmallFont));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   if (form.federation_origin.unique())
     label->SetObscured(true);
   return label;
 }
 
 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,
                    rb->GetImageNamed(IDR_CLOSE_2).ToImageSkia());
   button->SetImage(views::ImageButton::STATE_HOVERED,
                    rb->GetImageNamed(IDR_CLOSE_2_H).ToImageSkia());
   button->SetImage(views::ImageButton::STATE_PRESSED,
                    rb->GetImageNamed(IDR_CLOSE_2_P).ToImageSkia());
   button->SetFocusForPlatform();
   button->SetTooltipText(
@@ skipping 18 matching lines @@
   undo_link->SetUnderline(false);
   undo_link->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::SmallFont));
   return undo_link;
 }
 
 }  // namespace
 
 // 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,
                   int fixed_height);
   ~PasswordFormRow() override = default;
 
   void AddRow(views::GridLayout* layout);
 
   // Returns the fixed height for a row excluding padding. 0 means no fixed
   // height required.
   // In MANAGE_STATE a row may represent a credential or a deleted credential.
   // To avoid repositioning all the rows should have a fixed height.
   static int GetFixedHeight(password_manager::ui::State state);
 
  private:
   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;
 
   void ResetControls();
 
   ManagePasswordItemsView* host_;
   const autofill::PasswordForm* password_form_;
   // The UI elements pointers are weak and owned by their parent.
   views::Link* undo_link_;
@@ skipping 141 matching lines @@
                            deleted
                                ? ManagePasswordsBubbleModel::REMOVE_PASSWORD
                                : ManagePasswordsBubbleModel::ADD_PASSWORD);
 }
 
 void ManagePasswordItemsView::Refresh() {
   DCHECK_NE(password_manager::ui::PENDING_PASSWORD_STATE, model_->state());
   RemoveAllChildViews(true);
   AddRows();
 }