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

chrome/browser/ui/views/passwords/account_chooser_dialog_view.cc

 // Copyright 2015 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/passwords/account_chooser_dialog_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
@@ skipping 25 matching lines @@
   SINGLE_VIEW_COLUMN_SET,
   SINGLE_VIEW_COLUMN_SET_NO_PADDING,
 };
 
 // Construct a |type| ColumnSet and add it to |layout|.
 void BuildColumnSet(ColumnSetType type, views::GridLayout* layout) {
   views::ColumnSet* column_set = layout->AddColumnSet(type);
   const int horizontal_padding =
       type == SINGLE_VIEW_COLUMN_SET
           ? ChromeLayoutProvider::Get()->GetDistanceMetric(
-                DISTANCE_DIALOG_BUTTON_MARGIN)
+                views::DISTANCE_DIALOG_CONTENTS_HORIZONTAL_MARGIN)
           : 0;
   column_set->AddPaddingColumn(0, horizontal_padding);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
   column_set->AddPaddingColumn(0, horizontal_padding);
 }
@@ skipping 21 matching lines @@
   int item_height = 0;
   for (const auto& form : forms) {
     std::pair<base::string16, base::string16> titles =
         GetCredentialLabelsForAccountChooser(*form);
     CredentialsItemView* credential_view = new CredentialsItemView(
         button_listener, titles.first, titles.second, kButtonHoverColor,
         form.get(), request_context);
     credential_view->SetLowerLabelColor(kAutoSigninTextColor);
     ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
     gfx::Insets dialog_insets =
-        layout_provider->GetInsetsMetric(views::INSETS_PANEL);
+        layout_provider->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS);
     const int vertical_padding = layout_provider->GetDistanceMetric(
         views::DISTANCE_RELATED_CONTROL_VERTICAL);
     credential_view->SetBorder(
         views::CreateEmptyBorder(vertical_padding, dialog_insets.left(),
                                  vertical_padding, dialog_insets.right()));
     item_height = std::max(item_height, credential_view->GetPreferredHeight());
     list_view->AddChildView(credential_view);
   }
   views::ScrollView* scroll_view = new views::ScrollView;
   scroll_view->ClipHeightTo(0, kMaxHeightAccounts * item_height);
@@ skipping 114 matching lines @@
 
   // Show the title.
   ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
   layout->StartRowWithPadding(
       0, SINGLE_VIEW_COLUMN_SET, 0,
       layout_provider->GetInsetsMetric(views::INSETS_DIALOG_TITLE).top());
   layout->AddView(title_label);
 
   // Show credentials.
   gfx::Insets dialog_insets =
-      layout_provider->GetInsetsMetric(views::INSETS_PANEL);
+      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS);
   BuildColumnSet(SINGLE_VIEW_COLUMN_SET_NO_PADDING, layout);
   layout->StartRowWithPadding(0, SINGLE_VIEW_COLUMN_SET_NO_PADDING, 0,
                               dialog_insets.top());
   layout->AddView(CreateCredentialsView(
       controller_->GetLocalForms(),
       this,
       GetProfileFromWebContents(web_contents_)->GetRequestContext()));
   layout->AddPaddingRow(0, dialog_insets.bottom());
 }
 
 AccountChooserPrompt* CreateAccountChooserPromptView(
     PasswordDialogController* controller, content::WebContents* web_contents) {
   return new AccountChooserDialogView(controller, web_contents);
 }