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 21 matching lines @@
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/vector_icons.h"
 #include "ui/views/view.h"
 
@@ skipping 95 matching lines @@
     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,
     int name_column_width) {
   std::unique_ptr<PaymentRequestRowView> row =
       base::MakeUnique<PaymentRequestRowView>(listener, clickable);
   views::GridLayout* layout = new views::GridLayout(row.get());
+  row->SetLayoutManager(layout);
 
-  // The rows have extra inset compared to the header so that their right edge
+  // The rows have extra padding compared to the header so that their right edge
   // lines up with the close button's X rather than its invisible right edge.
-  layout->SetInsets(
+  row->SetBorder(views::CreateEmptyBorder(
       kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
       kPaymentRequestRowVerticalInsets,
-      kPaymentRequestRowHorizontalInsets + kPaymentRequestRowExtraRightInset);
-  row->SetLayoutManager(layout);
+      kPaymentRequestRowHorizontalInsets + kPaymentRequestRowExtraRightInset));
 
   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 723 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