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

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>
@@ skipping 214 matching lines @@
 
 void PaymentSheetViewController::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   switch (sender->tag()) {
     case static_cast<int>(
         PaymentSheetViewControllerTags::SHOW_ORDER_SUMMARY_BUTTON):
       dialog()->ShowOrderSummary();
       break;
 
     case static_cast<int>(PaymentSheetViewControllerTags::SHOW_SHIPPING_BUTTON):
-      dialog()->ShowShippingListSheet();
+      dialog()->ShowShippingProfileSheet();
       break;
 
     case static_cast<int>(
         PaymentSheetViewControllerTags::SHOW_PAYMENT_METHOD_BUTTON):
       dialog()->ShowPaymentMethodSheet();
       break;
 
     case static_cast<int>(
         PaymentSheetViewControllerTags::SHOW_CONTACT_INFO_BUTTON):
-      dialog()->ShowContactInfoSheet();
+      dialog()->ShowContactProfileSheet();
       break;
 
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
 void PaymentSheetViewController::UpdatePayButtonState(bool enabled) {
   pay_button_->SetEnabled(enabled);
@@ skipping 31 matching lines @@
       PaymentSheetViewControllerTags::SHOW_ORDER_SUMMARY_BUTTON));
   section->set_id(
       static_cast<int>(DialogViewID::PAYMENT_SHEET_SUMMARY_SECTION));
   return section;
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateShippingSectionContent() {
   auto* profile = request()->selected_shipping_profile();
 
-  // 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,
-                                                     std::string(), *profile)
+  return profile ? payments::GetShippingAddressLabel(
+                       AddressStyleType::SUMMARY, request()->locale(), *profile)
                  : 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               |
 // +----------------------------------------------+
@@ skipping 54 matching lines @@
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_PAYMENT_METHOD_BUTTON));
   section->set_id(
       static_cast<int>(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION));
   return section;
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateContactInfoSectionContent() {
   auto* profile = request()->selected_contact_profile();
-  // TODO(tmartino): Replace empty string with app locale.
-  return profile ? payments::GetContactInfoLabel(AddressStyleType::SUMMARY,
-                                                 std::string(), *profile, true,
-                                                 true, true)
+
+  return profile ? payments::GetContactInfoLabel(
+                       AddressStyleType::SUMMARY, request()->locale(), *profile,
+                       request()->request_payer_name(),
+                       request()->request_payer_email(),
+                       request()->request_payer_phone())
                  : 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              |

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

Let's keep the order of the contact elements consistent throughout to avoid
accidentally using name as email, phone as name, etc.

On lines 375-378, the order is name-email-phone. In this comment, the order is
name-phone-email. Please pick one style (preferably the one in the mocks, so
building UI is easier) and stick with it.

That is, please update all the files in this patch to use the same exact
ordering. Thank you!

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

Done

 // |                    1800MYPOTUS             > |
 // |                    potus@whitehouse.gov      |
 // +----------------------------------------------+
 std::unique_ptr<views::Button>
 PaymentSheetViewController::CreateContactInfoRow() {
   std::unique_ptr<views::Button> section = CreatePaymentSheetRow(
       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));
   section->set_id(
       static_cast<int>(DialogViewID::PAYMENT_SHEET_CONTACT_INFO_SECTION));
   return section;
 }
 
 }  // namespace payments