[WebPayments] Adding Shipping Address and Contact Info display to order summary

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 <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/views/payments/payment_request_address_util.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/payments/payment_request.h"
 #include "components/strings/grit/components_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 
 namespace payments {
 namespace {
 
+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 = static_cast<int>(
-      payments::PaymentRequestCommonTags::PAYMENT_REQUEST_COMMON_TAG_MAX),
+  SHOW_ORDER_SUMMARY_BUTTON = kFirstTagValue,
+  SHOW_SHIPPING_BUTTON = kFirstTagValue + 1,

[anthonyvd, 2017/01/12 15:42:11]

No need for the explicit value on enum members after the first one per the
standard: "For any other enumerator whose definition does not have an
initializer, the associated value is the value of the previous enumerator plus
one." (TIL!)

[tmartino, 2017/01/18 17:28:24]

Done

 };
 
 // Creates a clickable row to be displayed in the Payment Sheet. It contains
 // a section name and some content, followed by a chevron as a clickability
 // affordance. Both, either, or none of |content_view| and |extra_content_view|
 // may be present, the difference between the two being that content is pinned
 // to the left and extra_content is pinned to the right.
 // The row also displays a light gray horizontal ruler on its lower boundary.
 // +----------------------------+
 // | Name | Content | Extra | > |
@@ skipping 49 matching lines @@
       layout->SkipColumns(1);
     }
 
     views::ImageView* chevron = new views::ImageView();
     chevron->SetImage(gfx::CreateVectorIcon(
         gfx::VectorIconId::SUBMENU_ARROW,
         color_utils::DeriveDefaultIconColor(name_label->enabled_color())));
     layout->AddView(chevron);
   }
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(PaymentSheetRow);
 };
 
 }  // namespace
 
 PaymentSheetViewController::PaymentSheetViewController(
     PaymentRequest* request,
     PaymentRequestDialog* dialog)
     : PaymentRequestSheetController(request, dialog) {}
 
 PaymentSheetViewController::~PaymentSheetViewController() {}
 
 std::unique_ptr<views::View> PaymentSheetViewController::CreateView() {
   std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
 
   views::GridLayout* layout = new views::GridLayout(content_view.get());
   content_view->SetLayoutManager(layout);
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                      1, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentSheetSummaryRow().release());
 
+  layout->StartRow(1, 0);

[anthonyvd, 2017/01/12 15:42:11]

Do you have the first parameter here set to 0 on purpose? It's
|vertical_resize|, which I imagine would make the row stretch to the bottom of
the dialog.

[tmartino, 2017/01/18 17:28:24]

It doesn't have that effect here; the new row appears correctly including space
for the multi-line display. I believe it means "allow the row to grow to fit its
content", not "make the row as large as possible."

+  layout->AddView(CreatePaymentSheetShippingRow().release());
+
   return CreatePaymentView(
       CreateSheetHeaderView(
           false,
           l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_PAYMENT_SHEET_TITLE),
           this),
       std::move(content_view));
 }
 
 void PaymentSheetViewController::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   switch (sender->tag()) {
     case static_cast<int>(PaymentRequestCommonTags::CLOSE_BUTTON_TAG):
       dialog()->CloseDialog();
       break;
     case static_cast<int>(
         PaymentSheetViewControllerTags::SHOW_ORDER_SUMMARY_BUTTON):
       dialog()->ShowOrderSummary();
       break;
+    case static_cast<int>(PaymentSheetViewControllerTags::SHOW_SHIPPING_BUTTON):
+      // TODO(tmartino): Transition to shipping page once it exists.
+      break;
     default:
       NOTREACHED();
   }
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateOrderSummarySectionContent() {
   base::string16 label_value = l10n_util::GetStringFUTF16(
       IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_TOTAL_FORMAT,
       base::ASCIIToUTF16(request()->details()->total->label),
       base::ASCIIToUTF16(request()->details()->total->amount->currency),
       base::ASCIIToUTF16(request()->details()->total->amount->value));
 
   return base::MakeUnique<views::Label>(label_value);
 }
 
 std::unique_ptr<views::Button>
 PaymentSheetViewController::CreatePaymentSheetSummaryRow() {
   std::unique_ptr<views::Button> section = base::MakeUnique<PaymentSheetRow>(
       this,
       l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_NAME),
       std::unique_ptr<views::View>(nullptr),
       CreateOrderSummarySectionContent());
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_ORDER_SUMMARY_BUTTON));
   return section;
 }
 
+std::unique_ptr<views::View>
+PaymentSheetViewController::CreateShippingSectionContent() {
+  return payments::GetPaymentRequestAddressLabel(
+      AddressFormatType::SHIPPING_SUMMARY, "", GetDummyProfile().get());

[anthonyvd, 2017/01/12 15:42:11]

GetDummyProfile().get() here would likely delete the underlying pointer before
it's used in the function. I think my suggestion in the comment above should
address this, otherwise the unique_ptr should be held on until after the
payments::GetPaymentRequestAddressLabel call returns.

[tmartino, 2017/01/18 17:28:24]

Done (per your other suggestion)

+}
+
+std::unique_ptr<views::Button>
+PaymentSheetViewController::CreatePaymentSheetShippingRow() {
+  std::unique_ptr<views::Button> section = base::MakeUnique<PaymentSheetRow>(
+      this,
+      l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_SHIPPING_SECTION_NAME),
+      CreateShippingSectionContent(), std::unique_ptr<views::View>(nullptr));
+  section->set_tag(
+      static_cast<int>(PaymentSheetViewControllerTags::SHOW_SHIPPING_BUTTON));
+  return section;
+}
+
 }  // namespace payments