Remove GridLayout::SetInsets in favor of an empty border on the host.

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 <string>
 #include <utility>
@@ skipping 136 matching lines @@
 
 std::unique_ptr<views::Button> CreatePaymentSheetRow(
     views::ButtonListener* listener,
     const base::string16& section_name,
     std::unique_ptr<views::View> content_view,
     std::unique_ptr<views::View> extra_content_view,
     std::unique_ptr<views::View> trailing_button,
     bool clickable,
     bool extra_trailing_inset,
     int name_column_width) {
+  const int trailing_inset = extra_trailing_inset
+                                 ? kPaymentRequestRowHorizontalInsets +
+                                       kPaymentRequestRowExtraRightInset
+                                 : kPaymentRequestRowHorizontalInsets;
+  const gfx::Insets row_insets(
+      kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
+      kPaymentRequestRowVerticalInsets, trailing_inset);
   std::unique_ptr<PaymentRequestRowView> row =
-      base::MakeUnique<PaymentRequestRowView>(listener, clickable);
+      base::MakeUnique<PaymentRequestRowView>(listener, clickable, row_insets);
   views::GridLayout* layout = new views::GridLayout(row.get());
-
-  int trailing_inset = extra_trailing_inset
-                           ? kPaymentRequestRowHorizontalInsets +
-                                 kPaymentRequestRowExtraRightInset
-                           : kPaymentRequestRowHorizontalInsets;
-  layout->SetInsets(kPaymentRequestRowVerticalInsets,
-                    kPaymentRequestRowHorizontalInsets,
-                    kPaymentRequestRowVerticalInsets, trailing_inset);
   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 710 matching lines @@
   } else {
     return builder
         .Id(DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION_BUTTON)
         .CreateWithButton(
             l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_CHOOSE_AN_ADDRESS),
             l10n_util::GetStringUTF16(IDS_CHOOSE), /*button_enabled=*/false);
   }
 }
 
 }  // namespace payments