[Payments] After adding/editing a credit card, instrument is selected.

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>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/callback_forward.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_row_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/payments/content/payment_request_state.h"
 #include "components/payments/core/autofill_payment_instrument.h"
 #include "components/payments/core/payment_instrument.h"
@@ skipping 16 matching lines @@
     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:
-  // Does not take ownership of |instrument|, which  should not be null and
+  // 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),
         instrument_(instrument),
@@ skipping 38 matching lines @@
 
   bool CanBeSelected() const 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(
+            /*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();
   }
 
   PaymentInstrument* instrument_;
   PaymentRequestDialogView* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentMethodListItem);
 };
 
 }  // namespace
 
 PaymentMethodViewController::PaymentMethodViewController(
     PaymentRequestSpec* spec,
     PaymentRequestState* state,
     PaymentRequestDialogView* dialog)
     : PaymentRequestSheetController(spec, state, dialog) {
   const std::vector<std::unique_ptr<PaymentInstrument>>& available_instruments =
       state->available_instruments();
-
   for (const std::unique_ptr<PaymentInstrument>& instrument :
        available_instruments) {
     std::unique_ptr<PaymentMethodListItem> item =
         base::MakeUnique<PaymentMethodListItem>(
             instrument.get(), spec, state, &payment_method_list_, dialog,
             instrument.get() == state->selected_instrument());
     payment_method_list_.AddItem(std::move(item));
   }
 }
 
@@ skipping 29 matching lines @@
   extra_view->AddChildView(button);
 
   return extra_view;
 }
 
 void PaymentMethodViewController::ButtonPressed(views::Button* sender,
                                                 const ui::Event& event) {
   switch (sender->tag()) {
     case static_cast<int>(
         PaymentMethodViewControllerTags::ADD_CREDIT_CARD_BUTTON):
-      dialog()->ShowCreditCardEditor();
+      // Only provide the |on_added| callback, in response to this button.
+      dialog()->ShowCreditCardEditor(
+          /*on_edited=*/base::OnceClosure(),
+          /*on_added=*/
+          base::BindOnce(&PaymentRequestState::AddAutofillPaymentInstrument,
+                         base::Unretained(state()), /*selected=*/true),
+          /*credit_card=*/nullptr);
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 }  // namespace payments