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

chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc

 // Copyright 2014 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/chromeos/profiles/multiprofiles_session_aborted_dialog.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "base/macros.h"
@@ skipping 10 matching lines @@
 
 namespace chromeos {
 
 namespace {
 
 // Default width/height of the dialog.
 const int kDefaultWidth = 600;
 const int kDefaultHeight = 250;
 
 const int kPaddingToMessage = 20;
-const int kInset = 40;
-const int kTopInset = 10;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Dialog for an aborted multi-profile session due to a user policy change .
 class MultiprofilesSessionAbortedView : public views::DialogDelegateView {
  public:
   MultiprofilesSessionAbortedView();
   ~MultiprofilesSessionAbortedView() override;
 
   static void ShowDialog(const std::string& user_email);
 
@@ skipping 63 matching lines @@
 ui::ModalType MultiprofilesSessionAbortedView::GetModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
 gfx::Size MultiprofilesSessionAbortedView::GetPreferredSize() const {
   return gfx::Size(kDefaultWidth, kDefaultHeight);
 }
 
 void MultiprofilesSessionAbortedView::InitDialog(
     const std::string& user_email) {
-  const gfx::Insets kDialogInsets(kTopInset, kInset, kInset, kInset);
-
+  constexpr int kTopInset = 10;
+  constexpr int kInset = 40;

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

optional: kInset is rather generic, maybe kOtherInset.

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

Done.

   // Create the views and layout manager and set them up.
   views::GridLayout* grid_layout = views::GridLayout::CreatePanel(this);

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

As the next line sets the border, how about not using CreatePanel?

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

Done. Though like in the previous patch, my plan is to replace CreatePanel with
a method that sets the host view's layout manager.

-  grid_layout->SetInsets(kDialogInsets);
+  SetBorder(CreateEmptyBorder(kTopInset, kInset, kInset, kInset));
 
   views::ColumnSet* column_set = grid_layout->AddColumnSet(0);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
 
   views::Label* title_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_MULTIPROFILES_SESSION_ABORT_HEADLINE));
   title_label_->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::MediumBoldFont));
   title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ skipping 20 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Factory function.
 
 void ShowMultiprofilesSessionAbortedDialog(const std::string& user_email) {
   MultiprofilesSessionAbortedView::ShowDialog(user_email);
 }
 
 }  // namespace chromeos