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

chrome/browser/ui/views/first_run_dialog.cc

 // Copyright 2014 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/first_run_dialog.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/first_run/first_run.h"
 #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"
 #include "chrome/grit/locale_settings.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/l10n/l10n_util.h"
 #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"
 
 #if defined(OS_WIN)
 #include "components/crash/content/app/breakpad_win.h"
 #elif defined(OS_LINUX)
 #include "components/crash/content/app/breakpad_linux.h"
 #endif
 
 using views::GridLayout;
@@ skipping 36 matching lines @@
 
   return dialog_shown;
 }
 
 FirstRunDialog::FirstRunDialog(Profile* profile)
     : profile_(profile),
       make_default_(NULL),
       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,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   make_default_ = new views::Checkbox(l10n_util::GetStringUTF16(
       IDS_FR_CUSTOMIZE_DEFAULT_BROWSER));
   make_default_->SetChecked(true);
   layout->AddView(make_default_);
@@ skipping 39 matching lines @@
 }
 
 void FirstRunDialog::WindowClosing() {
   first_run::SetShouldShowWelcomePage();
   Done();
 }
 
 void FirstRunDialog::LinkClicked(views::Link* source, int event_flags) {
   platform_util::OpenExternal(profile_, GURL(chrome::kLearnMoreReportingURL));
 }