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

ui/views/controls/button/md_text_button.cc

 // Copyright 2015 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/controls/button/md_text_button.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/memory/ptr_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
@@ skipping 175 matching lines @@
 }
 
 MdTextButton::MdTextButton(ButtonListener* listener)
     : LabelButton(listener, base::string16()),
       is_prominent_(false) {
   SetInkDropMode(PlatformStyle::kUseRipples ? InkDropMode::ON
                                             : InkDropMode::OFF);
   set_has_ink_drop_action_on_click(true);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   SetFocusForPlatform();
-  const int minimum_width =
-      ViewsDelegate::GetInstance()->GetButtonMinimumWidth();
+  const int minimum_width = ViewsDelegate::GetInstance()->GetSpacingMetric(
+      SpacingMetric::DIALOG_BUTTON_MINIMUM_WIDTH);
   SetMinSize(gfx::Size(minimum_width, 0));
   SetFocusPainter(nullptr);
   label()->SetAutoColorReadabilityEnabled(false);
   set_request_focus_on_press(false);
   LabelButton::SetFontList(GetMdFontList());
 
   set_animate_on_state_change(true);
 
   // Paint to a layer so that the canvas is snapped to pixel boundaries (useful
   // for fractional DSF).
@@ skipping 25 matching lines @@
   int target_height = std::max(kBaseHeight + size_delta * 2,
                                label()->font_list().GetFontSize() * 2);
 
   int label_height = label()->GetPreferredSize().height();
   int top_padding = (target_height - label_height) / 2;
   int bottom_padding = (target_height - label_height + 1) / 2;
   DCHECK_EQ(target_height, label_height + top_padding + bottom_padding);
 
   // TODO(estade): can we get rid of the platform style border hoopla if
   // we apply the MD treatment to all buttons, even GTK buttons?
-  const int horizontal_padding =
-      ViewsDelegate::GetInstance()->GetButtonHorizontalPadding();
+  const int horizontal_padding = ViewsDelegate::GetInstance()->GetSpacingMetric(
+      SpacingMetric::BUTTON_HORIZONTAL_PADDING);
   SetBorder(CreateEmptyBorder(top_padding, horizontal_padding, bottom_padding,
                               horizontal_padding));
 }
 
 void MdTextButton::UpdateColors() {
   ui::NativeTheme::ColorId fg_color_id =
       is_prominent_ ? ui::NativeTheme::kColorId_TextOnProminentButtonColor
                     : ui::NativeTheme::kColorId_ButtonEnabledColor;
 
   ui::NativeTheme* theme = GetNativeTheme();
@@ skipping 43 matching lines @@
         stroke_color, gfx::kDisabledControlAlpha);
   }
 
   DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
   set_background(Background::CreateBackgroundPainter(
       Painter::CreateRoundRectWith1PxBorderPainter(bg_color, stroke_color,
                                                    kInkDropSmallCornerRadius)));
 }
 
 }  // namespace views