Remove references to ui/views/layout/layout_constants.h

chrome/browser/ui/views/chrome_cleaner_dialog_win.cc

 // Copyright 2017 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/chrome_cleaner_dialog_win.h"
 
 #include "base/strings/string16.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_dialog_controller_win.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/events/event.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace chrome {
 
 void ShowChromeCleanerPrompt(
     Browser* browser,
     safe_browsing::ChromeCleanerDialogController* controller) {
   ChromeCleanerDialog* dialog = new ChromeCleanerDialog(controller);
   dialog->Show(browser);
 }
 
 }  // namespace chrome
 
 namespace {
 constexpr int kDialogWidth = 448;
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ChromeCleanerDialog
 
 ChromeCleanerDialog::ChromeCleanerDialog(
     safe_browsing::ChromeCleanerDialogController* controller)
     : browser_(nullptr), controller_(controller) {
   DCHECK(controller_);
 
+  gfx::Insets dialog_insets = ChromeLayoutProvider::Get()->GetInsetsMetric(
+      views::INSETS_DIALOG_CONTENTS);

[Peter Kasting, 2017/06/06 03:34:33]

For this file, wait on https://chromium-review.googlesource.com/c/515902/ to
land, then pass INSETS_DIALOG_CONTENTS to the BoxLayout directly.

[ananta, 2017/06/06 03:44:56]

Sure reverted this change

   SetLayoutManager(new views::BoxLayout(
       /*orientation=*/views::BoxLayout::kVertical,
-      /*inside_border_horizontal_spacing=*/views::kButtonHEdgeMarginNew,
-      /*inside_border_vertical_spacing=*/views::kPanelVertMargin,
+      /*inside_border_horizontal_spacing=*/dialog_insets.left(),
+      /*inside_border_vertical_spacing=*/dialog_insets.top(),
       /*between_child_spacing=*/0));
   views::Label* label = new views::Label(controller_->GetMainText());
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(label);
 }
 
 ChromeCleanerDialog::~ChromeCleanerDialog() {
   // Make sure the controller is correctly notified in case the dialog widget is
   // closed by some other means than the dialog buttons.
@@ skipping 84 matching lines @@
   DCHECK(browser_);
 
   // TODO(alito): Navigate to the webui version of the Chrome Cleaner UI when
   // that is implemented.
   if (controller_) {
     controller_->DetailsButtonClicked();
     controller_ = nullptr;
   }
   GetWidget()->Close();
 }