[Web Payments] Refactor the row display code.

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/app/vector_icons/vector_icons.h"
 #include "chrome/browser/ui/views/payments/payment_request_sheet_controller.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/geometry/insets.h"
+#include "ui/gfx/geometry/point_f.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/background.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/label.h"
 #include "ui/views/controls/styled_label.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) {
   std::vector<autofill::ServerFieldType> fields;
   fields.push_back(autofill::COMPANY_NAME);
   fields.push_back(autofill::ADDRESS_HOME_LINE1);
   fields.push_back(autofill::ADDRESS_HOME_LINE2);
   fields.push_back(autofill::ADDRESS_HOME_DEPENDENT_LOCALITY);
   fields.push_back(autofill::ADDRESS_HOME_CITY);
   fields.push_back(autofill::ADDRESS_HOME_STATE);
   fields.push_back(autofill::ADDRESS_HOME_ZIP);
   fields.push_back(autofill::ADDRESS_HOME_SORTING_CODE);
 
   return profile.ConstructInferredLabel(fields, fields.size(), locale);
 }
 
+// Paints the gray horizontal line that doesn't span the entire width of the
+// dialog at the bottom of the view it borders.
+class PaymentRequestRowBorderPainter : public views::Painter {
+ public:
+  PaymentRequestRowBorderPainter() {}
+

[please use gerrit instead, 2017/01/25 16:22:55]

Need to override the parent destructor.

[anthonyvd, 2017/01/25 17:56:33]

Good catch! Done here and in the other classes this CL adds.

+ protected:

[please use gerrit instead, 2017/01/25 16:22:55]

This class has no children, so it's OK to make GetMinimumSize() and Paint()
either public or private. No need for protected methods.

[anthonyvd, 2017/01/25 17:56:33]

Done.

+  gfx::Size GetMinimumSize() const override {
+    return gfx::Size(2 * payments::kPaymentRequestRowHorizontalInsets, 1);
+  }
+
+  void Paint(gfx::Canvas* canvas, const gfx::Size& size) override {
+    int line_height = size.height() - 1;
+    canvas->DrawLine(
+        gfx::PointF(payments::kPaymentRequestRowHorizontalInsets, line_height),
+        gfx::PointF(size.width() - payments::kPaymentRequestRowHorizontalInsets,
+                    line_height),
+        SK_ColorLTGRAY);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PaymentRequestRowBorderPainter);
+};
+
 }  // namespace
 
 namespace payments {
 
 std::unique_ptr<views::View> CreateSheetHeaderView(
     bool show_back_arrow,
     const base::string16& title,
     views::VectorIconButtonDelegate* delegate) {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
   views::GridLayout* layout = new views::GridLayout(container.get());
   container->SetLayoutManager(layout);
+  layout->SetInsets(0, kPaymentRequestRowHorizontalInsets,
+                    0, kPaymentRequestRowHorizontalInsets);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   // A column for the optional back arrow.
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                      0, views::GridLayout::USE_PREF, 0, 0);
   // A column for the title.
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                      1, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
@@ skipping 24 matching lines @@
 
   // Paint the sheets to layers, otherwise the MD buttons (which do paint to a
   // layer) won't do proper clipping.
   view->SetPaintToLayer(true);
 
   views::GridLayout* layout = new views::GridLayout(view.get());
   view->SetLayoutManager(layout);
 
   constexpr int kTopInsetSize = 9;
   constexpr int kBottomInsetSize = 18;
-  constexpr int kSideInsetSize = 14;
-  layout->SetInsets(
-      kTopInsetSize, kSideInsetSize, kBottomInsetSize, kSideInsetSize);
+  layout->SetInsets(kTopInsetSize, 0, kBottomInsetSize, 0);
   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);
   // |header_view| will be deleted when |view| is.
   layout->AddView(header_view.release());
 
   layout->StartRow(0, 0);
   // |content_view| will be deleted when |view| is.
@@ skipping 61 matching lines @@
     values.push_back(name_value);
   if (!phone_value.empty())
     values.push_back(phone_value);
   if (!email_value.empty())
     values.push_back(email_value);
 
   return base::MakeUnique<views::StyledLabel>(
       base::JoinString(values, base::ASCIIToUTF16("\n")), nullptr);
 }
 
+// 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