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

chrome/browser/ui/views/first_run_dialog.cc

Index: chrome/browser/ui/views/first_run_dialog.cc
diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc
index 75cb9691250e0843a01ded5076d07c6369fbf93f..de46c75b4a96178c9744c2cd3c7255ae18fa9017 100644
--- a/chrome/browser/ui/views/first_run_dialog.cc
+++ b/chrome/browser/ui/views/first_run_dialog.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/metrics/metrics_reporting_state.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/shell_integration.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
@@ -25,7 +26,6 @@
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
@@ -82,7 +82,10 @@ FirstRunDialog::FirstRunDialog(Profile* profile)
       report_crashes_(NULL) {
   GridLayout* layout = GridLayout::CreatePanel(this);
 
-  const int related_y = views::kRelatedControlVerticalSpacing;
+  ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();

[Peter Kasting, 2017/04/25 03:21:19]

Nit: Can inline this into next statement

[ananta, 2017/04/25 21:50:28]

Done.

+
+  const int related_y =
+      provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL);

[Peter Kasting, 2017/04/25 03:21:19]

In theory we could inline this into the statement that uses it too, although
that may get very unwieldy

[ananta, 2017/04/25 21:50:28]

Done.

 
   views::ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,