[Payments] Selecting incomplete items will open editors

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/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"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 10 matching lines @@
   // 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
   // should outlive this object. |list| is the PaymentRequestItemList object
   // that will own this.
-  PaymentMethodListItem(PaymentInstrument* instrument,
+  PaymentMethodListItem(AutofillPaymentInstrument* instrument,
                         PaymentRequestSpec* spec,
                         PaymentRequestState* state,
                         PaymentRequestItemList* list,
                         PaymentRequestDialogView* dialog,
                         bool selected)
       : payments::PaymentRequestItemList::Item(spec, state, list, selected),
         instrument_(instrument),
         dialog_(dialog) {}
   ~PaymentMethodListItem() override {}
 
@@ skipping 26 matching lines @@
     return card_info_container;
   }
 
   void SelectedStateChanged() override {
     if (selected()) {
       state()->SetSelectedInstrument(instrument_);
       dialog_->GoBack();
     }
   }
 
-  bool CanBeSelected() const override {
-    // TODO(anthonyvd): Check for card completedness.
-    return true;
+  bool CanBeSelected() const override { return instrument_->IsValid(); }
+
+  void PerformSelectionFallback() override {
+    dialog_->ShowCreditCardEditor(instrument_->credit_card());
   }
 
-  void PerformSelectionFallback() override {
-    // TODO(anthonyvd): Open the editor pre-populated with this card's data.
-  }
-
-  PaymentInstrument* instrument_;
+  AutofillPaymentInstrument* instrument_;

[anthonyvd, 2017/04/07 20:08:09]

I don't think we want this, even if it's a temporary thing. Is there a way we
can make this instrument type agnostic right away?

What about adding a function on PaymentInstrument (something like
instrument_type()) that returns an enum value corresponding to the concrete
instrument's type? This way we can switch here to create derived
PaymentMethodListItem types.

[Mathieu, 2017/04/09 00:35:45]

You're right! Added a switch on the type() so that this will fail to compile if
we add a new instrument type.

   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) {
+    // TODO(crbug.com/709194): When this feature supports instruments that are
+    // not credit cards, the cast below is invalid.
     std::unique_ptr<PaymentMethodListItem> item =
         base::MakeUnique<PaymentMethodListItem>(
-            instrument.get(), spec, state, &payment_method_list_, dialog,
+            static_cast<AutofillPaymentInstrument*>(instrument.get()), spec,
+            state, &payment_method_list_, dialog,
             instrument.get() == state->selected_instrument());
     payment_method_list_.AddItem(std::move(item));
   }
 }
 
 PaymentMethodViewController::~PaymentMethodViewController() {}
 
 base::string16 PaymentMethodViewController::GetSheetTitle() {
   return l10n_util::GetStringUTF16(
       IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME);
@@ skipping 33 matching lines @@
         PaymentMethodViewControllerTags::ADD_CREDIT_CARD_BUTTON):
       dialog()->ShowCreditCardEditor();
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 }  // namespace payments