[Web Payments] Add "pencil" edit button to lists.

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

Index: chrome/browser/ui/views/payments/payment_method_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/payment_method_view_controller.cc b/chrome/browser/ui/views/payments/payment_method_view_controller.cc
index 20dfc7fb63161a86cf82073d6bd9b769a0fca59e..ed9fa979e2082c5156a6ae02a4d36c101255abf8 100644
--- a/chrome/browser/ui/views/payments/payment_method_view_controller.cc
+++ b/chrome/browser/ui/views/payments/payment_method_view_controller.cc
@@ -59,12 +59,35 @@ class PaymentMethodListItem : public payments::PaymentRequestItemList::Item {
                         PaymentRequestItemList* list,
                         PaymentRequestDialogView* dialog,
                         bool selected)
-      : payments::PaymentRequestItemList::Item(spec, state, list, selected),
+      : payments::PaymentRequestItemList::Item(spec,
+                                               state,
+                                               list,
+                                               selected,
+                                               /*show_edit_button=*/true),
         instrument_(instrument),
         dialog_(dialog) {}
   ~PaymentMethodListItem() override {}
 
  private:
+  void ShowEditor() {
+    switch (instrument_->type()) {
+      case PaymentInstrument::Type::AUTOFILL:

[Evan Stade, 2017/05/15 17:14:55]

are you going to add other types soon? You might just leave this as a DCHECK_EQ
for now to reduce indentation and improve readability

[anthonyvd, 2017/05/15 17:27:40]

Yes, web payment apps are in the pipeline and there's some other exploration
going on as well :)

+        // Since we are a list item, we only care about the on_edited callback.
+        dialog_->ShowCreditCardEditor(
+            BackNavigationType::kPaymentSheet,
+            static_cast<int>(PaymentMethodViewControllerTags::MAX_TAG),
+            /*on_edited=*/
+            base::BindOnce(&PaymentRequestState::SetSelectedInstrument,
+                           base::Unretained(state()), instrument_),
+            /*on_added=*/
+            base::OnceCallback<void(const autofill::CreditCard&)>(),
+            static_cast<AutofillPaymentInstrument*>(instrument_)
+                ->credit_card());
+        return;
+    }
+    NOTREACHED();
+  }
+
   // payments::PaymentRequestItemList::Item:
   std::unique_ptr<views::View> CreateExtraView() override {
     std::unique_ptr<views::ImageView> card_icon_view = CreateInstrumentIconView(
@@ -123,24 +146,9 @@ class PaymentMethodListItem : public payments::PaymentRequestItemList::Item {
     return instrument_->IsCompleteForPayment();
   }
 
-  void PerformSelectionFallback() override {
-    switch (instrument_->type()) {
-      case PaymentInstrument::Type::AUTOFILL:
-        // Since we are a list item, we only care about the on_edited callback.
-        dialog_->ShowCreditCardEditor(
-            BackNavigationType::kPaymentSheet,
-            static_cast<int>(PaymentMethodViewControllerTags::MAX_TAG),
-            /*on_edited=*/
-            base::BindOnce(&PaymentRequestState::SetSelectedInstrument,
-                           base::Unretained(state()), instrument_),
-            /*on_added=*/
-            base::OnceCallback<void(const autofill::CreditCard&)>(),
-            static_cast<AutofillPaymentInstrument*>(instrument_)
-                ->credit_card());
-        return;
-    }
-    NOTREACHED();
-  }
+  void PerformSelectionFallback() override { ShowEditor(); }
+
+  void EditButtonPressed() override { ShowEditor(); }
 
   PaymentInstrument* instrument_;
   PaymentRequestDialogView* dialog_;