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

chrome/browser/ui/views/settings_reset_prompt_dialog.cc

Index: chrome/browser/ui/views/settings_reset_prompt_dialog.cc
diff --git a/chrome/browser/ui/views/settings_reset_prompt_dialog.cc b/chrome/browser/ui/views/settings_reset_prompt_dialog.cc
index 9dfff2cc060d75dd7b21e7613c16c0e9369470a6..dc5f99ff2f61380a4dff6210a95641cfbf9c2d37 100644
--- a/chrome/browser/ui/views/settings_reset_prompt_dialog.cc
+++ b/chrome/browser/ui/views/settings_reset_prompt_dialog.cc
@@ -7,12 +7,12 @@
 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
@@ -39,9 +39,13 @@ SettingsResetPromptDialog::SettingsResetPromptDialog(
     : browser_(nullptr), controller_(controller) {
   DCHECK(controller_);
 
-  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
-                                        views::kButtonHEdgeMarginNew,
-                                        views::kPanelVertMargin, 0));
+  SetLayoutManager(
+      new views::BoxLayout(views::BoxLayout::kVertical,
+                           provider->GetDistanceMetric(
+                              DISTANCE_DIALOG_BUTTON_MARGIN),

[ananta, 2017/05/18 03:16:29]

Wasn't sure about a simpler FillLayout here.

[Peter Kasting, 2017/05/18 06:10:26]

Yeah, you could probably switch to a FillLayout if you set these insets on the
host (they can't be set on FillLayout itself).

+                           provider->GetDistanceMetric(
+                              DISTANCE_PANEL_CONTENT_MARGIN),
+                           0));
 
   views::StyledLabel* dialog_label =
       new views::StyledLabel(controller_->GetMainText(), /*listener=*/nullptr);