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

chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

 // Copyright (c) 2012 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/extensions/extension_install_dialog_view.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <string>
 #include <utility>
@@ skipping 265 matching lines @@
       provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);
   if (prompt_->ShouldShowPermissions()) {
     layout->AddPaddingRow(0, vertical_padding);
     layout->StartRow(0, column_set_id);
     layout->AddView(new views::Separator(), 3, 1, views::GridLayout::FILL,
                     views::GridLayout::FILL);
   }
 
   const int content_width =
       left_column_width +
-      provider->GetDistanceMetric(DISTANCE_PANEL_CONTENT_MARGIN) + kIconSize;
+      provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_HORIZONTAL) +

[Bret, 2017/05/17 22:11:41]

From what I can tell, this is the distance between the title/ratings and the
extension icon. I couldn't find any reason this should be
DISTANCE_PANEL_CONTENT_MARGIN specifically, so I changed it to this. It's
ultimately a 1-pixel difference.

+      kIconSize;
 
   // Create the scrollable view which will contain the permissions and retained
   // files/devices. It will span the full content width.
   CustomScrollableView* scrollable = new CustomScrollableView();
   views::GridLayout* scroll_layout = new views::GridLayout(scrollable);
   scrollable->SetLayoutManager(scroll_layout);
 
   views::ColumnSet* scrollable_column_set =
       scroll_layout->AddColumnSet(column_set_id);
 
   scrollable_column_set->AddColumn(
       views::GridLayout::LEADING, views::GridLayout::LEADING,
       0,  // no resizing
       views::GridLayout::USE_PREF, content_width, content_width);
 
   // Pad to the very right of the dialog, so the scrollbar will be on the edge.
-  const int button_margin =
-      provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN);
-  scrollable_column_set->AddPaddingColumn(0, button_margin);
+  const gfx::Insets button_row_insets =
+      provider->GetInsetsMetric(views::INSETS_DIALOG_BUTTON_ROW);
+  scrollable_column_set->AddPaddingColumn(0, button_row_insets.right());
 
   layout->StartRow(0, column_set_id);
   scroll_view_ = new views::ScrollView();
   scroll_view_->set_hide_horizontal_scrollbar(true);
   scroll_view_->SetContents(scrollable);
   layout->AddView(scroll_view_, 4, 1);
 
   if (prompt_->ShouldShowPermissions()) {
     bool has_permissions =
         prompt_->GetPermissionCount(
@@ skipping 61 matching lines @@
 
   DCHECK_GE(prompt_->type(), 0);
   UMA_HISTOGRAM_ENUMERATION("Extensions.InstallPrompt.Type",
                             prompt_->type(),
                             ExtensionInstallPrompt::NUM_PROMPT_TYPES);
 
   scroll_view_->ClipHeightTo(
       0,
       std::min(kScrollViewMaxHeight, scrollable->GetPreferredSize().height()));
 
-  dialog_size_ = gfx::Size(content_width + 2 * button_margin,
+  dialog_size_ = gfx::Size(content_width + button_row_insets.width(),
                            container_->GetPreferredSize().height());
 
   std::string event_name = ExperienceSamplingEvent::kExtensionInstallDialog;
   event_name.append(
       ExtensionInstallPrompt::PromptTypeToString(prompt_->type()));
   sampling_event_ = ExperienceSamplingEvent::Create(event_name);
 }
 
 bool ExtensionInstallDialogView::AddPermissions(
     views::GridLayout* layout,
@@ skipping 39 matching lines @@
     }
   }
   return true;
 }
 
 views::GridLayout* ExtensionInstallDialogView::CreateLayout(
     int left_column_width,
     int column_set_id) {
   container_ = new views::View();
   ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
-  const int horizontal_margin =
-      provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN);
-  const int bottom_margin =
-      provider->GetDistanceMetric(DISTANCE_PANEL_CONTENT_MARGIN);
+  const gfx::Insets content_insets =
+      provider->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS);
 
   // This is views::GridLayout::CreatePanel(), but without a top or right
   // margin. The empty dialog title will then become the top margin, and a
   // padding column will be manually added to handle a right margin. This is
   // done so that the extension icon can be shown on the right of the dialog
   // title, but on the same y-axis, and the scroll view used to contain other
   // content can have its scrollbar aligned with the right edge of the dialog.
   views::GridLayout* layout = new views::GridLayout(container_);
   container_->SetLayoutManager(layout);
-  container_->SetBorder(
-      views::CreateEmptyBorder(0, horizontal_margin, bottom_margin, 0));
+  container_->SetBorder(views::CreateEmptyBorder(0, content_insets.left(),
+                                                 content_insets.bottom(), 0));
   AddChildView(container_);
 
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING,
                         0,  // no resizing
                         views::GridLayout::USE_PREF,
                         0,  // no fixed width
                         left_column_width);
   column_set->AddPaddingColumn(
       0, provider->GetDistanceMetric(DISTANCE_UNRELATED_CONTROL_HORIZONTAL));
   column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::LEADING,
                         0,  // no resizing
                         views::GridLayout::USE_PREF,
                         0,  // no fixed width
                         kIconSize);
-  column_set->AddPaddingColumn(0, horizontal_margin);
+  column_set->AddPaddingColumn(0, content_insets.right());
 
   layout->StartRow(0, column_set_id);
   views::Label* title = new views::Label(prompt_->GetDialogTitle(),
                                          views::style::CONTEXT_DIALOG_TITLE);
   title->SetMultiLine(true);
   title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title->SizeToFit(left_column_width);
 
   // Center align the title along the vertical axis.
   layout->AddView(title, 1, 1, views::GridLayout::LEADING,
@@ skipping 302 matching lines @@
   gfx::ImageSkia icon = gfx::CreateVectorIcon(
       expanded ? kCaretUpIcon : kCaretDownIcon, gfx::kChromeIconGrey);
   arrow_toggle_->SetImage(views::Button::STATE_NORMAL, &icon);
 }
 
 // static
 ExtensionInstallPrompt::ShowDialogCallback
 ExtensionInstallPrompt::GetViewsShowDialogCallback() {
   return base::Bind(&ShowExtensionInstallDialogImpl);
 }