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

chrome/browser/ui/views/payments/cvc_unmask_view_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/cvc_unmask_view_controller.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autofill/risk_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/payments/full_card_request.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/payments/content/payment_request_state.h"
 #include "components/payments/core/payment_request_delegate.h"
 #include "components/signin/core/browser/profile_identity_provider.h"
 #include "components/signin/core/browser/signin_manager.h"
 #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/views/border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace payments {
 
 enum class Tags {
   CONFIRM_TAG = static_cast<int>(PaymentRequestCommonTags::PAY_BUTTON_TAG),
 };
@@ skipping 77 matching lines @@
 }
 
 base::string16 CvcUnmaskViewController::GetSheetTitle() {
   return l10n_util::GetStringFUTF16(IDS_AUTOFILL_CARD_UNMASK_PROMPT_TITLE,
                                     credit_card_.NetworkAndLastFourDigits());
 }
 
 void CvcUnmaskViewController::FillContentView(views::View* content_view) {
   std::unique_ptr<views::GridLayout> layout =
       base::MakeUnique<views::GridLayout>(content_view);
-  layout->SetInsets(
+  content_view->SetBorder(views::CreateEmptyBorder(
       kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets,
-      kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets);
+      kPaymentRequestRowVerticalInsets, kPaymentRequestRowHorizontalInsets));
 
   views::ColumnSet* instructions_columns = layout->AddColumnSet(0);
   instructions_columns->AddColumn(views::GridLayout::Alignment::LEADING,
                                   views::GridLayout::Alignment::LEADING, 1,
                                   views::GridLayout::SizeType::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   std::unique_ptr<views::Label> instructions = base::MakeUnique<views::Label>(
       l10n_util::GetStringUTF16(IDS_AUTOFILL_CARD_UNMASK_PROMPT_INSTRUCTIONS));
   instructions->SetMultiLine(true);
@@ skipping 70 matching lines @@
 bool CvcUnmaskViewController::GetSheetId(DialogViewID* sheet_id) {
   *sheet_id = DialogViewID::CVC_UNMASK_SHEET;
   return true;
 }
 
 views::View* CvcUnmaskViewController::GetFirstFocusedView() {
   return cvc_field_;
 }
 
 }  // namespace payments