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

chrome/browser/ui/views/importer/import_lock_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/importer/import_lock_dialog_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/metrics/user_metrics.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 45 matching lines @@
 }
 
 gfx::Size ImportLockDialogView::GetPreferredSize() const {
   return gfx::Size(views::Widget::GetLocalizedContentsSize(
       IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS,
       IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES));
 }
 
 void ImportLockDialogView::Layout() {
   gfx::Rect bounds(GetLocalBounds());
-  bounds.Inset(views::kButtonHEdgeMarginNew,
-               ChromeLayoutProvider::Get()->GetDistanceMetric(
-                   DISTANCE_PANEL_CONTENT_MARGIN));
+  const ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+  bounds.Inset(provider->GetDistanceMetric(
+                   views::DISTANCE_DIALOG_CONTENTS_HORIZONTAL_MARGIN),
+               provider->GetDistanceMetric(
+                   views::DISTANCE_DIALOG_CONTENTS_VERTICAL_MARGIN));
   description_label_->SetBoundsRect(bounds);
 }
 
 base::string16 ImportLockDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return l10n_util::GetStringUTF16((button == ui::DIALOG_BUTTON_OK) ?
       IDS_IMPORTER_LOCK_OK : IDS_IMPORTER_LOCK_CANCEL);
 }
 
 base::string16 ImportLockDialogView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_TITLE);
 }
 
 bool ImportLockDialogView::Accept() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(callback_, true));
   return true;
 }
 
 bool ImportLockDialogView::Cancel() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::BindOnce(callback_, false));
   return true;
 }