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

ui/views/examples/dialog_example.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 "ui/views/examples/dialog_example.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/controls/button/checkbox.h"
@@ skipping 113 matching lines @@
           base::ASCIIToUTF16("Fake Modeless (non-bubbles)"),
       }) {}
 
 DialogExample::~DialogExample() {}
 
 void DialogExample::CreateExampleView(View* container) {
   // GridLayout |resize_percent| constants.
   const float kFixed = 0.f;
   const float kStretchy = 1.f;
 
+  views::LayoutProvider* provider = views::LayoutProvider::Get();
   const int horizontal_spacing =
-      views::LayoutProvider::Get()->GetDistanceMetric(
-          views::DISTANCE_RELATED_BUTTON_HORIZONTAL);
+      provider->GetDistanceMetric(views::DISTANCE_RELATED_BUTTON_HORIZONTAL);
   GridLayout* layout = GridLayout::CreatePanel(container);
   container->SetLayoutManager(layout);
   ColumnSet* column_set = layout->AddColumnSet(kFieldsColumnId);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, kFixed,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(kFixed, horizontal_spacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, kStretchy,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(kFixed, horizontal_spacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, kFixed,
@@ skipping 18 matching lines @@
   layout->AddView(mode_);
 
   StartRowWithLabel(layout, "Bubble");
   AddCheckbox(layout, &bubble_);
   AddCheckbox(layout, &persistent_bubble_);
   persistent_bubble_->SetText(base::ASCIIToUTF16("Persistent"));
 
   column_set = layout->AddColumnSet(kButtonsColumnId);
   column_set->AddColumn(GridLayout::CENTER, GridLayout::CENTER, kStretchy,
                         GridLayout::USE_PREF, 0, 0);
-  layout->StartRowWithPadding(kFixed, kButtonsColumnId, kFixed,
-                              kUnrelatedControlVerticalSpacing);
+  layout->StartRowWithPadding(
+      kFixed, kButtonsColumnId, kFixed,
+      provider->GetDistanceMetric(views::DISTANCE_UNRELATED_CONTROL_VERTICAL));
   show_ =
       MdTextButton::CreateSecondaryUiButton(this, base::ASCIIToUTF16("Show"));
   layout->AddView(show_);
 
   // Grow the dialog a bit when this example is first selected, so it all fits.
   gfx::Size dialog_size = container->GetWidget()->GetRestoredBounds().size();
   dialog_size.set_height(dialog_size.height() + 80);
   container->GetWidget()->SetSize(dialog_size);
 }
 
@@ skipping 139 matching lines @@
 #endif
   show_->SetEnabled(enable);
   if (!enable && GetModalType() == ui::MODAL_TYPE_CHILD)
     PrintStatus("MODAL_TYPE_CHILD can't be used with non-bubbles.");
   if (!enable && GetModalType() == ui::MODAL_TYPE_SYSTEM)
     PrintStatus("MODAL_TYPE_SYSTEM isn't supported on Mac.");
 }
 
 }  // namespace examples
 }  // namespace views