Delete panel metrics and define insets in terms of distance metrics.

chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc

 // Copyright 2013 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/sync/profile_signin_confirmation_dialog_views.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 180 matching lines @@
           IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION :
           IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION,
           username, learn_more_text, &offsets);
   views::StyledLabel* explanation_label =
       new views::StyledLabel(signin_explanation_text, this);
   explanation_label->AddStyleRange(
       gfx::Range(offsets[1], offsets[1] + learn_more_text.size()),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
 
   // Layout the components.
-  const gfx::Insets panel_insets =
-      views::LayoutProvider::Get()->GetInsetsMetric(views::INSETS_PANEL);
-  // The prompt bar needs to go to the edge of the dialog, so ignore insets for
-  // the outer layout.
-  SetBorder(views::CreateEmptyBorder(panel_insets.top(), 0,
-                                     panel_insets.bottom(), 0));
+  const gfx::Insets content_insets =
+      views::LayoutProvider::Get()->GetInsetsMetric(
+          views::INSETS_DIALOG_CONTENTS);
+  // The prompt bar needs to go to the edge of the dialog, so remove horizontal
+  // insets.
+  SetBorder(views::CreateEmptyBorder(content_insets.top(), 0,
+                                     content_insets.bottom(), 0));
   views::GridLayout* dialog_layout = new views::GridLayout(this);
   SetLayoutManager(dialog_layout);
 
   // Use GridLayout inside the prompt bar because StyledLabel requires it.
   views::GridLayout* prompt_layout = views::GridLayout::CreatePanel(prompt_bar);
   constexpr int kPromptBarColumnSetId = 0;
   prompt_layout->AddColumnSet(kPromptBarColumnSetId)
       ->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 100,
                   views::GridLayout::USE_PREF, 0, 0);
   prompt_layout->StartRow(0, kPromptBarColumnSetId);
   prompt_layout->AddView(prompt_label);
   // Use a column set with no padding.
   dialog_layout->AddColumnSet(0)->AddColumn(
       views::GridLayout::FILL, views::GridLayout::FILL, 100,
       views::GridLayout::USE_PREF, 0, 0);
   dialog_layout->StartRow(0, 0);
   dialog_layout->AddView(
       prompt_bar, 1, 1,
       views::GridLayout::FILL, views::GridLayout::FILL, 0, 0);
 
   // Use a new column set for the explanation label so we can add padding.
-  dialog_layout->AddPaddingRow(0.0, panel_insets.top());
+  dialog_layout->AddPaddingRow(0.0, content_insets.top());
   constexpr int kExplanationColumnSetId = 1;
   views::ColumnSet* explanation_columns =
       dialog_layout->AddColumnSet(kExplanationColumnSetId);
-  explanation_columns->AddPaddingColumn(0.0, panel_insets.left());
+  explanation_columns->AddPaddingColumn(0.0, content_insets.left());
   explanation_columns->AddColumn(
       views::GridLayout::FILL, views::GridLayout::FILL, 100,
       views::GridLayout::USE_PREF, 0, 0);
-  explanation_columns->AddPaddingColumn(0.0, panel_insets.right());
+  explanation_columns->AddPaddingColumn(0.0, content_insets.right());
   dialog_layout->StartRow(0, kExplanationColumnSetId);
   const int kPreferredWidth = 440;
   dialog_layout->AddView(explanation_label, 1, 1, views::GridLayout::FILL,
                          views::GridLayout::FILL, kPreferredWidth,
                          explanation_label->GetHeightForWidth(kPreferredWidth));
 }
 
 void ProfileSigninConfirmationDialogViews::WindowClosing() {
   Cancel();
 }
@@ skipping 14 matching lines @@
 void ProfileSigninConfirmationDialogViews::ButtonPressed(
     views::Button* sender,
     const ui::Event& event) {
   DCHECK(prompt_for_new_profile_);
   if (delegate_) {
     delegate_->OnContinueSignin();
     delegate_ = nullptr;
   }
   GetWidget()->Close();
 }