[Web Payments] Refactor the row display code.

chrome/browser/ui/views/payments/order_summary_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/order_summary_view_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 25 matching lines @@
 // right-aliged label in the row. The |amount| text is bold if |bold_amount| is
 // true, which is only the case for the last row containing the total of the
 // order. |amount_label_id| is specified to recall the view later, e.g. in
 // tests.
 std::unique_ptr<views::View> CreateLineItemView(const base::string16& label,
                                                 const base::string16& amount,
                                                 bool bold_amount,
                                                 DialogViewID amount_label_id) {
   std::unique_ptr<views::View> row = base::MakeUnique<views::View>();
 
-  row->SetBorder(views::CreateSolidSidedBorder(0, 0, 1, 0, SK_ColorLTGRAY));
+  row->SetBorder(payments::CreatePaymentRequestRowBorder());
 
   views::GridLayout* layout = new views::GridLayout(row.get());
 
+  // The vertical spacing for these rows is slightly different than the spacing
+  // spacing for clickable rows, so don't use kPaymentRequestRowVerticalInsets.
   constexpr int kRowVerticalInset = 12;
-  layout->SetInsets(kRowVerticalInset, 0, kRowVerticalInset, 0);
+  layout->SetInsets(kRowVerticalInset,
+                    payments::kPaymentRequestRowHorizontalInsets,
+                    kRowVerticalInset,
+                    payments::kPaymentRequestRowHorizontalInsets);
 
   row->SetLayoutManager(layout);
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                      0, views::GridLayout::USE_PREF, 0, 0);
   columns->AddPaddingColumn(1, 0);
   columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
                      0, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
@@ skipping 80 matching lines @@
       break;
     case static_cast<int>(PaymentRequestCommonTags::BACK_BUTTON_TAG):
       dialog()->GoBack();
       break;
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace payments