[Web Payments] Implement item selection in 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 31 matching lines @@
 
 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,
                         PaymentRequestSpec* spec,
                         PaymentRequestState* state,
                         PaymentRequestItemList* list,
+                        PaymentRequestDialogView* dialog,
                         bool selected)
       : payments::PaymentRequestItemList::Item(spec, state, list, selected),
-        instrument_(instrument) {}
+        instrument_(instrument),
+        dialog_(dialog) {}
   ~PaymentMethodListItem() override {}
 
  private:
   // 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);
   }
@@ skipping 12 matching lines @@
 
     card_info_container->AddChildView(new views::Label(instrument_->label()));
     card_info_container->AddChildView(
         new views::Label(instrument_->sublabel()));
     // TODO(anthonyvd): Add the "card is incomplete" label once the
     // completedness logic is implemented.
     return card_info_container;
   }
 
   void SelectedStateChanged() override {
-    state()->SetSelectedInstrument(instrument_);
+    if (selected()) {
+      state()->SetSelectedInstrument(instrument_);
+      dialog_->GoBack();
+    }
   }
 
   bool CanBeSelected() const override {
     // TODO(anthonyvd): Check for card completedness.
     return true;
   }
 
   void PerformSelectionFallback() override {
     // TODO(anthonyvd): Open the editor pre-populated with this card's data.
   }
 
   PaymentInstrument* instrument_;
-  std::unique_ptr<views::ImageView> checkmark_;
+  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_,
+            instrument.get(), spec, state, &payment_method_list_, dialog,
             instrument.get() == state->selected_instrument());
     payment_method_list_.AddItem(std::move(item));
   }
 }
 
 PaymentMethodViewController::~PaymentMethodViewController() {}
 
 std::unique_ptr<views::View> PaymentMethodViewController::CreateView() {
   std::unique_ptr<views::View> list_view =
       payment_method_list_.CreateListView();
@@ skipping 33 matching lines @@
         PaymentMethodViewControllerTags::ADD_CREDIT_CARD_BUTTON):
       dialog()->ShowCreditCardEditor();
       break;
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 }  // namespace payments