[WebPayments] Extracting common code from Shipping + Contact Info views.

chrome/browser/ui/views/payments/profile_list_view_controller.cc

Index: chrome/browser/ui/views/payments/profile_list_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/profile_list_view_controller.cc b/chrome/browser/ui/views/payments/profile_list_view_controller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c351c91ebe29a6474e86c17dc6c3773735ba68b3
--- /dev/null
+++ b/chrome/browser/ui/views/payments/profile_list_view_controller.cc
@@ -0,0 +1,182 @@
+// 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/profile_list_view_controller.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.h"
+#include "components/strings/grit/components_strings.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/views/controls/image_view.h"
+#include "ui/views/layout/grid_layout.h"
+
+namespace payments {
+
+namespace {
+
+class ProfileItem : public PaymentRequestItemList::Item {
+ public:
+  // Constructs an object owned by |parent_list|, representing one element in
+  // the list. |request| is the PaymentRequest object that is represented by the
+  // current instance of the dialog. |parent_view| points to the controller
+  // which owns |parent_list|. |profile| is the AutofillProfile that this
+  // specific list item represents. It's a cached profile owned by |request|.
+  ProfileItem(autofill::AutofillProfile* profile,
+              PaymentRequest* request,
+              PaymentRequestItemList* parent_list,
+              ProfileListViewController* parent_view,
+              bool selected)
+      : payments::PaymentRequestItemList::Item(request, parent_list, selected),
+        parent_view_(parent_view),
+        profile_(profile) {}
+  ~ProfileItem() override {}
+
+ private:
+  // payments::PaymentRequestItemList::Item:
+  std::unique_ptr<views::View> CreateItemView() override {
+    DCHECK(profile_);
+
+    std::unique_ptr<views::View> content = parent_view_->GetLabel(profile_);
+
+    std::unique_ptr<PaymentRequestRowView> row =
+        base::MakeUnique<PaymentRequestRowView>(this);
+    views::GridLayout* layout = new views::GridLayout(row.get());
+    row->SetLayoutManager(layout);
+
+    layout->SetInsets(
+        kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
+        kPaymentRequestRowVerticalInsets,
+        kPaymentRequestRowHorizontalInsets + kPaymentRequestRowExtraRightInset);
+
+    // Add a column listing the profile information.
+    views::ColumnSet* columns = layout->AddColumnSet(0);
+    columns->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING, 1,
+                       views::GridLayout::USE_PREF, 0, 0);
+
+    columns->AddPaddingColumn(1, 0);
+
+    // Add a column for the checkmark shown next to the selected profile.
+    columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
+                       0, views::GridLayout::USE_PREF, 0, 0);
+
+    layout->StartRow(0, 0);
+    content->set_can_process_events_within_subtree(false);
+    layout->AddView(content.release());
+
+    checkmark_ = CreateCheckmark(selected());
+    layout->AddView(checkmark_.get());
+
+    return std::move(row);
+  }
+
+  void SelectedStateChanged() override {}
+
+  ProfileListViewController* parent_view_;
+  autofill::AutofillProfile* profile_;
+  std::unique_ptr<views::ImageView> checkmark_;
+};

[please use gerrit instead, 2017/03/10 20:23:12]

DISALLOW_COPY_AND_ASSIGN

[tmartino, 2017/03/10 23:46:23]

Done

+
+// The ProfileListViewController subtype for the Shipping address list
+// screen of the Payment Request flow.
+class ShippingProfileViewController : public ProfileListViewController {
+ public:
+  ShippingProfileViewController(PaymentRequest* request,
+                                PaymentRequestDialogView* dialog)
+      : ProfileListViewController(request, dialog) {}
+  ~ShippingProfileViewController() override {}
+
+ protected:
+  // ProfileListViewController:
+  std::unique_ptr<views::View> GetLabel(
+      autofill::AutofillProfile* profile) override {
+    return GetShippingAddressLabel(AddressStyleType::DETAILED,
+                                   request_->locale(), *profile);
+  }
+
+  std::vector<autofill::AutofillProfile*> GetProfiles() override {
+    return request_->shipping_profiles();
+  }
+
+  base::string16 GetHeaderString() override {
+    return l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_SHIPPING_SECTION_NAME);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ShippingProfileViewController);
+};
+
+class ContactProfileViewController : public ProfileListViewController {
+ public:
+  ContactProfileViewController(PaymentRequest* request,
+                               PaymentRequestDialogView* dialog)
+      : ProfileListViewController(request, dialog) {}
+  ~ContactProfileViewController() override {}
+
+ protected:
+  // ProfileListViewController:
+  std::unique_ptr<views::View> GetLabel(
+      autofill::AutofillProfile* profile) override {
+    return GetContactInfoLabel(AddressStyleType::DETAILED, request_->locale(),
+                               *profile, request_->request_payer_name(),
+                               request_->request_payer_email(),
+                               request_->request_payer_phone());
+  }
+
+  std::vector<autofill::AutofillProfile*> GetProfiles() override {
+    return request_->contact_profiles();
+  }
+
+  base::string16 GetHeaderString() override {
+    return l10n_util::GetStringUTF16(
+        IDS_PAYMENT_REQUEST_CONTACT_INFO_SECTION_NAME);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ContactProfileViewController);
+};
+
+}  // namespace
+
+// static
+std::unique_ptr<ProfileListViewController>
+ProfileListViewController::GetShippingProfileViewController(
+    PaymentRequest* request,
+    PaymentRequestDialogView* dialog) {
+  return base::MakeUnique<ShippingProfileViewController>(request, dialog);
+}
+
+// static
+std::unique_ptr<ProfileListViewController>
+ProfileListViewController::GetContactProfileViewController(
+    PaymentRequest* request,
+    PaymentRequestDialogView* dialog) {
+  return base::MakeUnique<ContactProfileViewController>(request, dialog);
+}
+
+ProfileListViewController::ProfileListViewController(
+    PaymentRequest* request,
+    PaymentRequestDialogView* dialog)
+    : PaymentRequestSheetController(request, dialog), request_(request) {}
+
+ProfileListViewController::~ProfileListViewController() {}
+
+std::unique_ptr<views::View> ProfileListViewController::CreateView() {
+  autofill::AutofillProfile* selected_profile =
+      request()->selected_shipping_profile();
+
+  // This must be done at Create-time, rather than construct-time, because
+  // the subclass method GetProfiles can't be called in the ctor.
+  for (auto* profile : GetProfiles()) {
+    list_.AddItem(base::MakeUnique<ProfileItem>(
+        profile, request(), &list_, this, profile == selected_profile));
+  }
+
+  return CreatePaymentView(
+      CreateSheetHeaderView(
+          /* show_back_arrow = */ true, GetHeaderString(), this),
+      list_.CreateListView());
+}
+
+}  // namespace payments