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

chrome/browser/ui/views/first_run_bubble.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/first_run_bubble.h"
 
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/layout_constants.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/search_engines/util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/event_monitor.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kTopInset = 1;
 const int kLeftInset = 2;
 const int kBottomInset = 7;
 const int kRightInset = 2;
 }  // namespace
 
 // static
@@ skipping 26 matching lines @@
       new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE));
   change->SetFontList(original_font_list);
   change->set_listener(this);
 
   views::Label* subtext = new views::Label(
       l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT), {original_font_list});
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   layout->SetInsets(kTopInset, kLeftInset, kBottomInset, kRightInset);
 
+  ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
                      views::GridLayout::USE_PREF, 0, 0);
-  columns->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
+  columns->AddPaddingColumn(0, provider->GetDistanceMetric(
+                                   views::DISTANCE_RELATED_CONTROL_HORIZONTAL));
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,
                      views::GridLayout::USE_PREF, 0, 0);
   columns->AddPaddingColumn(1, 0);
 
   layout->StartRow(0, 0);
   layout->AddView(title);
   layout->AddView(change);
-  layout->StartRowWithPadding(0, 0, 0,
-      views::kRelatedControlSmallVerticalSpacing);
+  layout->StartRowWithPadding(
+      0, 0, 0,
+      provider->GetDistanceMetric(DISTANCE_RELATED_CONTROL_VERTICAL_SMALL));
   layout->AddView(subtext, columns->num_columns(), 1);
 }
 
 FirstRunBubble::FirstRunBubble(Browser* browser, views::View* anchor_view)
     : views::BubbleDialogDelegateView(anchor_view,
                                       views::BubbleBorder::TOP_LEFT),
       browser_(browser),
       bubble_closer_(this, anchor_view) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(
@@ skipping 46 matching lines @@
 
 void FirstRunBubble::FirstRunBubbleCloser::CloseBubble() {
   if (!event_monitor_)
     return;
 
   event_monitor_.reset();
   DCHECK(bubble_);
   bubble_->GetWidget()->Close();
   bubble_ = nullptr;
 }