[WebPayments] Extracting common code from Shipping + Contact Info views.

chrome/browser/ui/views/payments/payment_method_view_controller.cc

 // Copyright 2017 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/payments/payment_method_view_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 22 matching lines @@
 
 constexpr int kFirstTagValue = static_cast<int>(
     payments::PaymentRequestCommonTags::PAYMENT_REQUEST_COMMON_TAG_MAX);
 
 enum class PaymentMethodViewControllerTags : int {
   // The tag for the button that triggers the "add card" flow. Starts at
   // |kFirstTagValue| not to conflict with tags common to all views.
   ADD_CREDIT_CARD_BUTTON = kFirstTagValue,
 };
 
-class PaymentMethodListItem : public payments::PaymentRequestItemList::Item,
-                              public views::ButtonListener {
+class PaymentMethodListItem : public payments::PaymentRequestItemList::Item {
  public:
   // Does not take ownership of |card|, which  should not be null and should
   // outlive this object. |list| is the PaymentRequestItemList object that will
   // own this.
   PaymentMethodListItem(autofill::CreditCard* card,
                         PaymentRequest* request,
                         PaymentRequestItemList* list,
                         bool selected)
       : payments::PaymentRequestItemList::Item(request, list, selected),
         card_(card) {}
@@ skipping 155 matching lines @@
         PaymentMethodViewControllerTags::ADD_CREDIT_CARD_BUTTON):
       dialog()->ShowCreditCardEditor();
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 }  // namespace payments