[Web Payments] Add the shipping method section to the payment sheet

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

 // Copyright 2016 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_sheet_view_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 39 matching lines @@
 
 constexpr int kFirstTagValue = static_cast<int>(
     payments::PaymentRequestCommonTags::PAYMENT_REQUEST_COMMON_TAG_MAX);
 
 enum class PaymentSheetViewControllerTags {
   // The tag for the button that navigates to the Order Summary sheet.
   SHOW_ORDER_SUMMARY_BUTTON = kFirstTagValue,
   SHOW_SHIPPING_BUTTON,
   SHOW_PAYMENT_METHOD_BUTTON,
   SHOW_CONTACT_INFO_BUTTON,
+  SHOW_SHIPPING_METHOD_BUTTON,
   PAY_BUTTON
 };
 
 int ComputeWidestNameColumnViewWidth() {
   // The name colums in each row should all have the same width, large enough to
   // accomodate the longest piece of text they contain. Because of this, each
   // row's GridLayout requires its first column to have a fixed width of the
   // correct size. To measure the required size, layout a label with each
   // section name, measure its width, then initialize |widest_column_width|
   // with the largest value.
@@ skipping 138 matching lines @@
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                      1, views::GridLayout::USE_PREF, 0, 0);
 
   // The shipping address and contact info rows are optional.
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentSheetSummaryRow().release());
 
   if (request()->request_shipping()) {
     layout->StartRow(0, 0);
     layout->AddView(CreateShippingRow().release());
+    layout->StartRow(0, 0);
+    layout->AddView(CreateShippingMethodRow().release());
   }
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentMethodRow().release());
   if (request()->request_payer_name() || request()->request_payer_email() ||
       request()->request_payer_phone()) {
     layout->StartRow(0, 0);
     layout->AddView(CreateContactInfoRow().release());
   }
 
   return CreatePaymentView(
@@ skipping 265 matching lines @@
       l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_CONTACT_INFO_SECTION_NAME),
       CreateContactInfoSectionContent(), std::unique_ptr<views::View>(nullptr),
       widest_name_column_view_width_);
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_CONTACT_INFO_BUTTON));
   section->set_id(
       static_cast<int>(DialogViewID::PAYMENT_SHEET_CONTACT_INFO_SECTION));
   return section;
 }
 
+std::unique_ptr<views::View>
+PaymentSheetViewController::CreateShippingMethodContent() {
+  std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
+
+  std::unique_ptr<views::BoxLayout> layout =
+      base::MakeUnique<views::BoxLayout>(views::BoxLayout::kVertical, 0, 0, 0);
+  layout->set_cross_axis_alignment(
+      views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
+  container->SetLayoutManager(layout.release());
+
+  if (request()->selected_shipping_option()) {

[Mathieu, 2017/03/09 19:07:03]

pull this out first since it's being reused 3 times?

[anthonyvd, 2017/03/09 19:43:55]

Done.

+    container->AddChildView(new views::Label(
+        base::ASCIIToUTF16(request()->selected_shipping_option()->label)));
+    container->AddChildView(
+        new views::Label(request()->GetFormattedCurrencyAmount(
+            request()->selected_shipping_option()->amount->value)));
+  }
+
+  return container;
+}
+
+std::unique_ptr<views::Button>
+PaymentSheetViewController::CreateShippingMethodRow() {
+  std::unique_ptr<views::Button> section = CreatePaymentSheetRow(
+      this,
+      l10n_util::GetStringUTF16(
+          IDS_PAYMENT_REQUEST_SHIPPING_METHOD_SECTION_NAME),
+      CreateShippingMethodContent(), std::unique_ptr<views::View>(nullptr),
+      widest_name_column_view_width_);
+  section->set_tag(static_cast<int>(
+      PaymentSheetViewControllerTags::SHOW_SHIPPING_METHOD_BUTTON));
+  section->set_id(
+      static_cast<int>(DialogViewID::PAYMENT_SHEET_SHIPPING_METHOD_SECTION));
+  return section;
+}
+
 }  // namespace payments