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

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 <vector>
 
@@ skipping 41 matching lines @@
  public:
   // Does not take ownership of |instrument|, which should not be null and
   // should outlive this object. |list| is the PaymentRequestItemList object
   // that will own this.
   PaymentMethodListItem(PaymentInstrument* instrument,
                         PaymentRequestSpec* spec,
                         PaymentRequestState* state,
                         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(
         instrument_->icon_resource_id(), instrument_->label());
     card_icon_view->SetImageSize(gfx::Size(32, 20));
     return std::move(card_icon_view);
   }
 
   std::unique_ptr<views::View> CreateContentView() override {
     std::unique_ptr<views::View> card_info_container =
@@ skipping 38 matching lines @@
     // All items are enabled.
     return true;
   }
 
   bool CanBeSelected() override {
     // If an instrument can't be selected, PerformSelectionFallback is called,
     // where the instrument can be made complete.
     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_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentMethodListItem);
 };
 
 }  // namespace
 
 PaymentMethodViewController::PaymentMethodViewController(
@@ skipping 62 matching lines @@
                          base::Unretained(state()), /*selected=*/true),
           /*credit_card=*/nullptr);
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 }  // namespace payments