Refactor ViewsDelegate and MD-ify the icon-to-text spacing for checkbox and radiobutton

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;
 
-  const int horizontal_spacing =
-      ViewsDelegate::GetInstance()->GetDialogRelatedButtonHorizontalSpacing();
+  const int horizontal_spacing = ViewsDelegate::GetInstance()->GetSpacingMetric(
+      views::SpacingMetric::RELATED_HORIZONTAL_BUTTON);
   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 34 matching lines @@
   // 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);
 }
 
 void DialogExample::StartRowWithLabel(GridLayout* layout, const char* label) {
   const float kFixedVerticalResize = 0.f;
   layout->StartRowWithPadding(
       kFixedVerticalResize, kFieldsColumnId, kFixedVerticalResize,
-      ViewsDelegate::GetInstance()->GetDialogRelatedControlVerticalSpacing());
+      ViewsDelegate::GetInstance()->GetSpacingMetric(
+          views::SpacingMetric::RELATED_VERTICAL_CONTROL));
   layout->AddView(new Label(base::ASCIIToUTF16(label)));
 }
 
 void DialogExample::StartTextfieldRow(GridLayout* layout,
                                       Textfield** member,
                                       const char* label,
                                       const char* value) {
   StartRowWithLabel(layout, label);
   Textfield* textfield = new Textfield();
   layout->AddView(textfield);
@@ skipping 119 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