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

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"
@@ skipping 177 matching lines @@
     bool show_back_arrow,
     const base::string16& title,
     views::ButtonListener* listener) {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
   views::GridLayout* layout = new views::GridLayout(container.get());
   container->SetLayoutManager(layout);
 
   constexpr int kHeaderTopVerticalInset = 14;
   constexpr int kHeaderBottomVerticalInset = 8;
   constexpr int kHeaderHorizontalInset = 16;
-  // Top, left, bottom, right.
-  layout->SetInsets(kHeaderTopVerticalInset, kHeaderHorizontalInset,
-                    kHeaderBottomVerticalInset, kHeaderHorizontalInset);
+  container->SetBorder(views::CreateEmptyBorder(
+      kHeaderTopVerticalInset, kHeaderHorizontalInset,
+      kHeaderBottomVerticalInset, kHeaderHorizontalInset));
 
   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);
 
   constexpr int kPaddingBetweenArrowAndTitle = 16;
   if (show_back_arrow)
     columns->AddPaddingColumn(0, kPaddingBetweenArrowAndTitle);
 
@@ skipping 127 matching lines @@
 
   std::unique_ptr<views::View> base_label =
       GetBaseProfileLabel(type, name, phone, email);
 
   base_label->AddChildView(GetLabelForMissingInformation(
                                comp.GetStringForMissingContactFields(profile))
                                .release());
   return base_label;
 }
 
-std::unique_ptr<views::Border> CreatePaymentRequestRowBorder(SkColor color) {
+std::unique_ptr<views::Border> CreatePaymentRequestRowBorder(
+    SkColor color,
+    const gfx::Insets& insets) {
   return views::CreateBorderPainter(
-      base::MakeUnique<PaymentRequestRowBorderPainter>(color), gfx::Insets());
+      base::MakeUnique<PaymentRequestRowBorderPainter>(color), insets);
 }
 
 std::unique_ptr<views::Label> CreateBoldLabel(const base::string16& text) {
   std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(text);
 
   label->SetFontList(
       label->font_list().DeriveWithWeight(gfx::Font::Weight::BOLD));
 
   return label;
 }
@@ skipping 28 matching lines @@
     amount_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     amount_label->set_id(
         static_cast<int>(DialogViewID::SHIPPING_OPTION_AMOUNT));
     container->AddChildView(amount_label.release());
   }
 
   return container;
 }
 
 }  // namespace payments