[Web Payments] Implement item selection in lists.

chrome/browser/ui/views/payments/payment_request_item_list.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_request_item_list.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 "components/payments/content/payment_request_state.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/vector_icons.h"
 #include "ui/views/view.h"
@@ skipping 89 matching lines @@
   std::unique_ptr<views::View> extra_view = CreateExtraView();
   if (extra_view)
     layout->AddView(extra_view.release());
 
   return std::move(row);
 }
 
 void PaymentRequestItemList::Item::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
   if (CanBeSelected()) {
-    list()->SelectItem(this);
+    list()->SelectItem(this, /*go_back=*/true);

[Mathieu, 2017/03/21 13:56:59]

Do you think we could do 

if (CanBeSelected()) {
  list()->SelectItem(this);
}
PerformSelectionConfirmed(/*item_was_selected=*/CanBeSelected());

Each subclass would know what to do in case of item selection. I prefer each
subclass having to decide whether to call dialog_->GoBack().

Let me know what you think.

[anthonyvd, 2017/03/21 14:56:06]

I changed the code to call GoBack in subclasses implementation of
SelectedStateChanged(). This seemed a bit cleaner than adding another function
that would only call GoBack, yet as flexible.

   } else {
     PerformSelectionFallback();
   }
 }
 
-PaymentRequestItemList::PaymentRequestItemList() : selected_item_(nullptr) {}
+PaymentRequestItemList::PaymentRequestItemList(PaymentRequestDialogView* dialog)
+    : selected_item_(nullptr), dialog_(dialog) {}
 
 PaymentRequestItemList::~PaymentRequestItemList() {}
 
 void PaymentRequestItemList::AddItem(
     std::unique_ptr<PaymentRequestItemList::Item> item) {
   DCHECK_EQ(this, item->list());
   items_.push_back(std::move(item));
   if (items_.back()->selected())
-    SelectItem(items_.back().get());
+    SelectItem(items_.back().get(), /*go_back=*/false);
 }
 
 std::unique_ptr<views::View> PaymentRequestItemList::CreateListView() {
   std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
 
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kVertical, 0, kPaymentRequestRowVerticalInsets, 0);
   content_view->SetLayoutManager(layout);
 
   for (auto& item : items_) {
     content_view->AddChildView(item->GetItemView());
   }
 
   return content_view;
 }
 
-void PaymentRequestItemList::SelectItem(PaymentRequestItemList::Item* item) {
+void PaymentRequestItemList::SelectItem(PaymentRequestItemList::Item* item,
+                                        bool go_back) {
   DCHECK_EQ(this, item->list());
   if (selected_item_ == item)
     return;
 
   UnselectSelectedItem();
 
   selected_item_ = item;
   item->SetSelected(true);
+  if (go_back)
+    dialog_->GoBack();
 }
 
 void PaymentRequestItemList::UnselectSelectedItem() {
   // It's possible that no item is currently selected, either during list
   // creation or in the middle of the selection operation when the previously
   // selected item has been deselected but the new one isn't selected yet.
   if (selected_item_)
     selected_item_->SetSelected(false);
 
   selected_item_ = nullptr;
 }
 
 }  // namespace payments