Views/Harmony: Use LayoutDelegate::GetMetric for views::kPanelVertMargin.

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/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/importer/importer_lock_dialog.h"
+#include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 using base::UserMetricsAction;
@@ skipping 30 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::kButtonHEdgeMargin, views::kPanelVertMargin);
+  bounds.Inset(views::kButtonHEdgeMargin,

[tapted, 2017/02/27 03:24:51]

This should probably be using the "new" edge margin (i.e. I don't think this
dialog is a special snowflake - it should use the same margins as everything
else.. also it should probably be using a LayoutManager, but that's orthogonal).

[Peter Kasting, 2017/02/28 02:21:39]

+1 to all this

[Patti Lor, 2017/03/03 08:24:39]

Done.

+               LayoutDelegate::Get()->GetMetric(
+                   LayoutDelegate::Metric::PANEL_CONTENT_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::Bind(callback_, true));
   return true;
 }
 
 bool ImportLockDialogView::Cancel() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                 base::Bind(callback_, false));
   return true;
 }