[Web Payments] Add the contact info screen.

chrome/browser/ui/views/payments/payment_request_views_util.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_request_views_util.h"
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/payments/payment_request_sheet_controller.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.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 "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/vector_icons/vector_icons.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/vector_icon_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/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 
 namespace {
 
 // TODO(tmartino): Consider combining this with the Android equivalent in
 // PersonalDataManager.java
 base::string16 GetAddressFromProfile(const autofill::AutofillProfile& profile,
                                      const std::string& locale) {
@@ skipping 126 matching lines @@
     values.push_back(name_value);
   if (!address_value.empty())
     values.push_back(address_value);
   if (!phone_value.empty())
     values.push_back(phone_value);
 
   return base::MakeUnique<views::StyledLabel>(
       base::JoinString(values, base::ASCIIToUTF16("\n")), nullptr);
 }
 
 std::unique_ptr<views::View> GetContactInfoLabel(

[Mathieu, 2017/02/28 21:15:16]

Add a TODO: there needs to be a unit test for how we layout labels, wdyt?

[anthonyvd, 2017/03/01 15:27:55]

Good point. Done.

     AddressStyleType type,
     const std::string& locale,
     const autofill::AutofillProfile& profile,
     bool show_payer_name,
     bool show_payer_email,
     bool show_payer_phone) {
-  base::string16 name_value;
-  base::string16 phone_value;
-  base::string16 email_value;
+  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());
+
+  constexpr int kMissingName = 1;
+  constexpr int kMissingPhone = 1 << 1;
+  constexpr int kMissingEmail = 1 << 2;
+  int missing_fields = 0;
 
   if (show_payer_name) {
-    name_value =
+    base::string16 name =
         profile.GetInfo(autofill::AutofillType(autofill::NAME_FULL), locale);
-
-    // TODO(tmartino): Add bold styling for name in DETAILED style.
+    if (!name.empty()) {
+      std::unique_ptr<views::Label> label =
+          base::MakeUnique<views::Label>(name);
+      if (type == AddressStyleType::DETAILED) {
+        const gfx::FontList& font_list = label->font_list();
+        label->SetFontList(font_list.DeriveWithWeight(gfx::Font::Weight::BOLD));
+      }
+      container->AddChildView(label.release());
+    } else {
+      missing_fields |= kMissingName;
+    }
   }
 
   if (show_payer_phone) {
-    phone_value = profile.GetInfo(
+    base::string16 phone = profile.GetInfo(
         autofill::AutofillType(autofill::PHONE_HOME_WHOLE_NUMBER), locale);
+    if (!phone.empty()) {
+      std::unique_ptr<views::Label> label =
+          base::MakeUnique<views::Label>(phone);
+      container->AddChildView(label.release());
+    } else {
+      missing_fields |= kMissingPhone;
+    }
   }
 
   if (show_payer_email) {
-    email_value = profile.GetInfo(
+    base::string16 email = profile.GetInfo(
         autofill::AutofillType(autofill::EMAIL_ADDRESS), locale);
+    if (!email.empty()) {
+      std::unique_ptr<views::Label> label =
+          base::MakeUnique<views::Label>(email);
+      container->AddChildView(label.release());
+    } else {
+      missing_fields |= kMissingEmail;
+    }
   }
 
-  std::vector<base::string16> values;
-  if (!name_value.empty())
-    values.push_back(name_value);
-  if (!phone_value.empty())
-    values.push_back(phone_value);
-  if (!email_value.empty())
-    values.push_back(email_value);
+  // TODO(anthonyvd): add the error label based on the value of |missing_fields|
 
-  return base::MakeUnique<views::StyledLabel>(
-      base::JoinString(values, base::ASCIIToUTF16("\n")), nullptr);
+  return container;
 }
 
 // Creates a views::Border object that can paint the gray horizontal ruler used
 // as a separator between items in the Payment Request dialog.
 std::unique_ptr<views::Border> CreatePaymentRequestRowBorder() {
   return views::CreateBorderPainter(
       base::MakeUnique<PaymentRequestRowBorderPainter>(),
       gfx::Insets());
 }
 
 }  // namespace payments