Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/payments/payment_request_sheet_controller.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_SHEET_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_SHEET_CONTROLLER_H_
 
 #include <memory>
 
 #include "base/macros.h"
-#include "ui/views/controls/button/vector_icon_button_delegate.h"
+#include "ui/views/controls/button/button.h"
 
 namespace views {
-class Button;
 class View;
 }
 
 namespace payments {
 
 class PaymentRequestDialogView;
 class PaymentRequestSpec;
 class PaymentRequestState;
 
 // The base class for objects responsible for the creation and event handling in
 // views shown in the PaymentRequestDialog.
-class PaymentRequestSheetController : public views::VectorIconButtonDelegate {
+class PaymentRequestSheetController : public views::ButtonListener {
  public:
   // Objects of this class are owned by |dialog|, so it's a non-owned pointer
   // that should be valid throughout this object's lifetime.
   // |state| and |spec| are also not owned by this and are guaranteed to outlive
   // dialog. Neither |state|, |spec| or |dialog| should be null.
   PaymentRequestSheetController(PaymentRequestSpec* spec,
                                 PaymentRequestState* state,
                                 PaymentRequestDialogView* dialog);
   ~PaymentRequestSheetController() override {}
 
@@ skipping 21 matching lines @@
   // extra view is to be displayed.The caller takes ownership of the view but
   // the view is guaranteed to be outlived by the controller so subclasses may
   // retain a raw pointer to the returned view (for example to control its
   // enabled state). The horizontal and vertical insets (to the left and bottom
   // borders) is taken care of by the caller, so can be set to 0.
   // +---------------------------+
   // | EXTRA VIEW | PAY | CANCEL |
   // +---------------------------+
   virtual std::unique_ptr<views::View> CreateExtraFooterView();
 
-  // views::VectorIconButtonDelegate:
+  // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // Creates a view to be displayed in the PaymentRequestDialog.
   // |header_view| is the view displayed on top of the dialog, containing title,
   // (optional) back button, and close buttons.
   // |content_view| is displayed between |header_view| and the pay/cancel
   // buttons. Also adds the footer, returned by CreateFooterView(), which is
   // clamped to the bottom of the containing view.  The returned view takes
   // ownership of |header_view|, |content_view|, and the footer.
   // +---------------------------+
@@ skipping 17 matching lines @@
   PaymentRequestSpec* spec_;
   PaymentRequestState* state_;
   PaymentRequestDialogView* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestSheetController);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_SHEET_CONTROLLER_H_