[Web Payments] Add Cancel button to all sheets

chrome/browser/ui/views/payments/payment_sheet_view_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_SHEET_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_SHEET_VIEW_CONTROLLER_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "chrome/browser/ui/views/payments/payment_request_sheet_controller.h"
-#include "ui/views/controls/button/vector_icon_button_delegate.h"
 
 namespace payments {
 
 class PaymentRequest;
 class PaymentRequestDialogView;
 
 // The PaymentRequestSheetController subtype for the Payment Sheet screen of the
 // Payment Request dialog.
-class PaymentSheetViewController : public PaymentRequestSheetController,
-                                   public views::VectorIconButtonDelegate {
+class PaymentSheetViewController : public PaymentRequestSheetController {
  public:
   // Does not take ownership of the arguments, which should outlive this object.
   PaymentSheetViewController(PaymentRequest* request,
                              PaymentRequestDialogView* dialog);
   ~PaymentSheetViewController() override;
 
   // PaymentRequestSheetController:
   std::unique_ptr<views::View> CreateView() override;
 
  private:
-  // views::VectorIconButtonDelegate:
+  // PaymentRequestSheetController:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   std::unique_ptr<views::View> CreateOrderSummarySectionContent();
   std::unique_ptr<views::View> CreateShippingSectionContent();
   std::unique_ptr<views::Button> CreateShippingRow();
   std::unique_ptr<views::Button> CreatePaymentSheetSummaryRow();
   std::unique_ptr<views::Button> CreatePaymentMethodRow();
   std::unique_ptr<views::View> CreateContactInfoSectionContent();
   std::unique_ptr<views::Button> CreateContactInfoRow();
 
   const int widest_name_column_view_width_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentSheetViewController);
 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_SHEET_VIEW_CONTROLLER_H_