Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/payments/payment_request_views_util.h

 // Copyright 2016 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 CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_VIEWS_UTIL_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_VIEWS_UTIL_H_
 
 #include <memory>
 #include <string>
 
 #include "base/strings/string16.h"
 #include "components/payments/content/payment_request.mojom.h"
 
 namespace autofill {
 class AutofillProfile;
 }
 
 namespace views {
 class Border;
+class ButtonListener;
 class ImageView;
 class Label;
-class VectorIconButtonDelegate;
 class View;
 }
 
 namespace payments {
 
 constexpr int kPaymentRequestRowHorizontalInsets = 16;
 constexpr int kPaymentRequestRowVerticalInsets = 8;
 
 // Extra inset relative to the header when a right edge should line up with the
 // close button's X rather than its invisible right edge.
@@ skipping 13 matching lines @@
 // Creates and returns a header for all the sheets in the PaymentRequest dialog.
 // The header contains an optional back arrow button (if |show_back_arrow| is
 // true), a |title| label. |delegate| becomes the delegate for the back and
 // close buttons.
 // +---------------------------+
 // | <- | Title                |
 // +---------------------------+
 std::unique_ptr<views::View> CreateSheetHeaderView(
     bool show_back_arrow,
     const base::string16& title,
-    views::VectorIconButtonDelegate* delegate);
+    views::ButtonListener* delegate);
 
 // Returns an instrument image view for the given |icon_resource_id|. Includes
 // a rounded rect border. Callers need to set the size of the resulting
 // ImageView. Callers should set a |tooltip_text|.
 std::unique_ptr<views::ImageView> CreateInstrumentIconView(
     int icon_resource_id,
     const base::string16& tooltip_text);
 
 // Represents formatting options for each of the different contexts in which an
 // Address label may be displayed.
@@ skipping 29 matching lines @@
 base::string16 GetShippingOptionSectionString(
     payments::mojom::PaymentShippingType shipping_type);
 
 std::unique_ptr<views::View> CreateShippingOptionLabel(
     payments::mojom::PaymentShippingOption* shipping_option,
     const base::string16& formatted_amount);
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_VIEWS_UTIL_H_