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

chrome/browser/ui/views/payments/payment_request_sheet_controller.cc

 // Copyright 2017 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_sheet_controller.h"
 
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "components/payments/content/payment_request.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/background.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace payments {
 
 namespace {
@@ skipping 201 matching lines @@
   layout->AddView(footer.release());
 
   view->SetFirstFocusableView(GetFirstFocusedView());
 
   return std::move(view);
 }
 
 std::unique_ptr<views::View> PaymentRequestSheetController::CreateFooterView() {
   std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
 
+  // The horizontal distance between the right/left edges of the dialog and the
+  // elements.
+  constexpr int kFooterHorizontalInset = 16;
+  // The vertical distance between footer elements and the top/bottom border
+  // (the bottom border is the edge of the dialog).
+  constexpr int kFooterVerticalInset = 16;

[sky, 2017/05/05 14:36:39]

optional: as these values are the same combine and rename to kInset.

[Bret, 2017/05/06 00:36:43]

Done.

+  container->SetBorder(
+      views::CreateEmptyBorder(kFooterVerticalInset, kFooterHorizontalInset,
+                               kFooterVerticalInset, kFooterHorizontalInset));
+
   views::GridLayout* layout = new views::GridLayout(container.get());
   container->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);
 
-  // The horizontal distance between the right/left edges of the dialog and the
-  // elements.
-  constexpr int kFooterHorizontalInset = 16;
-  // The vertical distance between footer elements and the top/bottom border
-  // (the bottom border is the edge of the dialog).
-  constexpr int kFooterVerticalInset = 16;
-  layout->SetInsets(kFooterVerticalInset, kFooterHorizontalInset,
-                    kFooterVerticalInset, kFooterHorizontalInset);
   layout->StartRow(0, 0);
   std::unique_ptr<views::View> extra_view = CreateExtraFooterView();
   if (extra_view)
     layout->AddView(extra_view.release());
   else
     layout->SkipColumns(1);
 
   std::unique_ptr<views::View> trailing_buttons_container =
       base::MakeUnique<views::View>();
 
@@ skipping 35 matching lines @@
 
 bool PaymentRequestSheetController::PerformPrimaryButtonAction() {
   if (primary_button_ && primary_button_->enabled()) {
     ButtonPressed(primary_button_.get(), DummyEvent());
     return true;
   }
   return false;
 }
 
 }  // namespace payments