[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 <algorithm>
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include "base/memory/ptr_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.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/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
@@ skipping 17 matching lines @@
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/resources/vector_icons/vector_icons.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,
   SHOW_PAYMENT_METHOD_BUTTON,
+  SHOW_CONTACT_INFO_BUTTON,
 };
 
 // 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.
 // The name column has a fixed width equal to |name_column_width|.
 // +----------------------------+
@@ skipping 58 matching lines @@
       layout->SkipColumns(1);
     }
 
     views::ImageView* chevron = new views::ImageView();
     chevron->SetImage(gfx::CreateVectorIcon(
         views::kSubmenuArrowIcon,
         color_utils::DeriveDefaultIconColor(name_label->enabled_color())));
     layout->AddView(chevron);
   }
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(PaymentSheetRow);
 };
 
 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.
-  std::vector<int> section_names {
-    IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_NAME,
-    IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME,
-  };
+  std::vector<int> section_names{
+      IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_NAME,
+      IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME,
+      IDS_PAYMENT_REQUEST_SHIPPING_SECTION_NAME};
 
   int widest_column_width = 0;
 
   views::Label label(base::ASCIIToUTF16(""));
   for (int name_id : section_names) {
     label.SetText(l10n_util::GetStringUTF16(name_id));
     widest_column_width = std::max(
         label.GetPreferredSize().width(),
         widest_column_width);
   }
@@ skipping 15 matching lines @@
   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);
+  layout->AddView(CreateShippingRow().release());
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentMethodRow().release());
+  layout->StartRow(1, 0);
+  layout->AddView(CreateContactInfoRow().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;
+
     case static_cast<int>(
         PaymentSheetViewControllerTags::SHOW_PAYMENT_METHOD_BUTTON):
       dialog()->ShowPaymentMethodSheet();
       break;
+
+    case static_cast<int>(
+        PaymentSheetViewControllerTags::SHOW_CONTACT_INFO_BUTTON):
+      // TODO(tmartino): Transition to contact info page once it exists.
+      break;
+
     default:
       NOTREACHED();
   }
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateOrderSummarySectionContent() {
   CurrencyFormatter* formatter = request()->GetOrCreateCurrencyFormatter(
       request()->details()->total->amount->currency,
       request()->details()->total->amount->currency_system,
@@ skipping 18 matching lines @@
       this,
       l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SECTION_NAME),
       std::unique_ptr<views::View>(nullptr),
       CreateOrderSummarySectionContent(),
       widest_name_column_view_width_);
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_ORDER_SUMMARY_BUTTON));
   return section;
 }
 
+std::unique_ptr<views::View>
+PaymentSheetViewController::CreateShippingSectionContent() {
+  auto profile = request()->GetCurrentlySelectedProfile();
+
+  // TODO(tmartino): Empty string param is app locale; this should be passed
+  // at construct-time and stored as a member in a future CL.
+  return profile ? payments::GetShippingAddressLabel(AddressStyleType::SUMMARY,
+                                                     "", *profile)

[sky, 2017/01/18 23:19:25]

"" -> std::string()

[tmartino, 2017/01/19 16:36:59]

Done to both.

+                 : base::MakeUnique<views::Label>(base::string16());
+}
+
+// Creates the Shipping row, which contains a "Shipping address" label, the
+// user's selected shipping address, and a chevron.
+// +----------------------------------------------+
+// | Shipping Address   Barack Obama              |
+// |                    1600 Pennsylvania Ave.  > |
+// |                    1800MYPOTUS               |
+// +----------------------------------------------+
+std::unique_ptr<views::Button> PaymentSheetViewController::CreateShippingRow() {
+  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),
+      widest_name_column_view_width_);
+  section->set_tag(
+      static_cast<int>(PaymentSheetViewControllerTags::SHOW_SHIPPING_BUTTON));
+  return section;
+}
+
 // Creates the Payment Method row, which contains a "Payment" label, the user's
 // masked Credit Card details, the icon for the selected card, and a chevron.
 // +----------------------------------------------+
 // | Payment         Visa ****0000                |
 // |                 John Smith        | VISA | > |
 // |                                              |
 // +----------------------------------------------+
 std::unique_ptr<views::Button>
 PaymentSheetViewController::CreatePaymentMethodRow() {
   autofill::CreditCard* selected_card =
@@ skipping 36 matching lines @@
       l10n_util::GetStringUTF16(
           IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME),
       std::move(content_view),
       std::move(card_icon_view),
       widest_name_column_view_width_);
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_PAYMENT_METHOD_BUTTON));
   return section;
 }
 
+std::unique_ptr<views::View>
+PaymentSheetViewController::CreateContactInfoSectionContent() {
+  auto profile = request()->GetCurrentlySelectedProfile();
+  // TODO(tmartino): Replace empty string with app locale.
+  return profile ? payments::GetContactInfoLabel(AddressStyleType::SUMMARY, "",

[sky, 2017/01/18 23:19:25]

"" -> std::string()

+                                                 *profile, true, true, true)
+                 : base::MakeUnique<views::Label>(base::string16());
+}
+
+// Creates the Contact Info row, which contains a "Contact info" label; the
+// name, email address, and/or phone number; and a chevron.
+// +----------------------------------------------+
+// | Contact info       Barack Obama              |
+// |                    1800MYPOTUS             > |
+// |                    potus@whitehouse.gov      |
+// +----------------------------------------------+
+std::unique_ptr<views::Button>
+PaymentSheetViewController::CreateContactInfoRow() {
+  std::unique_ptr<views::Button> section = base::MakeUnique<PaymentSheetRow>(
+      this,
+      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));
+  return section;
+}
+
 }  // namespace payments