[WebPayments] Updating Shipping List to use PaymentRequestRowView

[WebPayments] Updating Shipping List to use PaymentRequestRowView

BUG=679449
Review-Url: https://codereview.chromium.org/2700713005
Cr-Commit-Position: refs/heads/master@{#451143}
Committed: https://chromium.googlesource.com/chromium/src/+/d97a44b5bd017589a205d8a7b3f9c68d1b867b4d

[tmartino, 2017-02-16 16:39:24]

tmartino@chromium.org changed reviewers:
+ rouslan@chromium.org

[tmartino, 2017-02-16 16:41:02]

The CQ bit was checked by tmartino@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-16 16:41:37]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-16 18:08:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-16 18:08:18]

Dry run: This issue passed the CQ dry run.

[please use gerrit instead, 2017-02-16 19:12:38]

lgtm

[please use gerrit instead, 2017-02-16 19:12:38]

lgtm

lgtm

[tmartino, 2017-02-16 19:17:05]

The CQ bit was checked by tmartino@chromium.org

[commit-bot: I haz the power, 2017-02-16 19:18:01]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-16 19:29:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-16 19:30:02]

Failed to apply patch for
chrome/browser/ui/views/payments/shipping_list_view_controller.cc:
While running git apply --index -p1;
  error: patch failed:
chrome/browser/ui/views/payments/shipping_list_view_controller.cc:36
  error: chrome/browser/ui/views/payments/shipping_list_view_controller.cc:
patch does not apply

Patch:       chrome/browser/ui/views/payments/shipping_list_view_controller.cc
Index: chrome/browser/ui/views/payments/shipping_list_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/shipping_list_view_controller.cc
b/chrome/browser/ui/views/payments/shipping_list_view_controller.cc
index
79acfeedb56c4c6be684efa2730ccf247f2ff491..5779d7b09eb8b8b82ad29bb57acab316bb6417d7
100644
--- a/chrome/browser/ui/views/payments/shipping_list_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_list_view_controller.cc
@@ -8,11 +8,13 @@
 #include <utility>
 
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.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/payment_request.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/grid_layout.h"
 
 namespace payments {
 
@@ -36,8 +38,8 @@ std::unique_ptr<views::View>
ShippingListViewController::CreateView() {
   for (auto& profile : request()->shipping_profiles()) {
     // TODO(tmartino): Pass an actual locale in place of empty string.
     content_view->AddChildView(
-        GetShippingAddressLabel(AddressStyleType::DETAILED, std::string(),
-                                *profile)
+        CreateAddressRow(GetShippingAddressLabel(AddressStyleType::DETAILED,
+                                                 std::string(), *profile))
             .release());
   }
 
@@ -49,4 +51,28 @@ std::unique_ptr<views::View>
ShippingListViewController::CreateView() {
       std::move(content_view));
 }
 
+std::unique_ptr<views::Button> ShippingListViewController::CreateAddressRow(
+    std::unique_ptr<views::View> content) {
+  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 address.
+  views::ColumnSet* columns = layout->AddColumnSet(0);
+  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                     views::GridLayout::USE_PREF, 0, 0);
+
+  layout->StartRow(0, 0);
+  content->set_can_process_events_within_subtree(false);
+  layout->AddView(content.release());
+
+  return std::move(row);
+}
+
 }  // namespace payments

[tmartino, 2017-02-16 19:43:44]

The CQ bit was checked by tmartino@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-16 19:44:29]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-16 22:23:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-16 22:23:17]

Dry run: This issue passed the CQ dry run.

[tmartino, 2017-02-16 22:30:16]

The CQ bit was checked by tmartino@chromium.org

[tmartino, 2017-02-16 22:30:16]

The patchset sent to the CQ was uploaded after l-g-t-m from rouslan@chromium.org
Link to the patchset: https://codereview.chromium.org/2700713005/#ps20001
(title: "rebase")

[commit-bot: I haz the power, 2017-02-16 22:31:30]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-16 23:59:01]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1487284216174510,
"parent_rev": "5dd4fb35920fffa84d53cb908b83668b2c7db1b8", "commit_rev":
"d97a44b5bd017589a205d8a7b3f9c68d1b867b4d"}

[commit-bot: I haz the power, 2017-02-17 00:00:04]

Description was changed from

==========
[WebPayments] Updating Shipping List to use PaymentRequestRowView

BUG=679449
==========

to

==========
[WebPayments] Updating Shipping List to use PaymentRequestRowView

BUG=679449

Review-Url: https://codereview.chromium.org/2700713005
Cr-Commit-Position: refs/heads/master@{#451143}
Committed:
https://chromium.googlesource.com/chromium/src/+/d97a44b5bd017589a205d8a7b3f9...
==========

[commit-bot: I haz the power, 2017-02-17 00:00:06]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/d97a44b5bd017589a205d8a7b3f9...