[WebPayments] Updating Shipping List to use PaymentRequestRowView

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 88 matching lines @@
     const base::string16& section_name,
     std::unique_ptr<views::View> content_view,
     std::unique_ptr<views::View> extra_content_view,
     int name_column_width) {
   std::unique_ptr<PaymentRequestRowView> row =
       base::MakeUnique<PaymentRequestRowView>(listener);
   views::GridLayout* layout = new views::GridLayout(row.get());
 
   // The rows have extra inset compared to the header so that their right edge
   // lines up with the close button's X rather than its invisible right edge.
-  constexpr int kRowExtraRightInset = 8;
-  layout->SetInsets(kPaymentRequestRowVerticalInsets,
-                    kPaymentRequestRowHorizontalInsets,
-                    kPaymentRequestRowVerticalInsets,
-                    kPaymentRequestRowHorizontalInsets + kRowExtraRightInset);
+  layout->SetInsets(
+      kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
+      kPaymentRequestRowVerticalInsets,
+      kPaymentRequestRowHorizontalInsets + kPaymentRequestRowExtraRightInset);
   row->SetLayoutManager(layout);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   // A column for the section name.
   columns->AddColumn(views::GridLayout::LEADING,
                      views::GridLayout::LEADING,
                      0,
                      views::GridLayout::FIXED,
                      name_column_width,
                      0);
@@ skipping 255 matching lines @@
       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