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

chrome/browser/ui/views/harmony/layout_delegate.cc

Index: chrome/browser/ui/views/harmony/layout_delegate.cc
diff --git a/chrome/browser/ui/views/harmony/layout_delegate.cc b/chrome/browser/ui/views/harmony/layout_delegate.cc
index 4ecca847866344e28d68e68bc75946bd8e22d7fd..79d88b025d46793b2f222bb49774826f079f2359 100644
--- a/chrome/browser/ui/views/harmony/layout_delegate.cc
+++ b/chrome/browser/ui/views/harmony/layout_delegate.cc
@@ -6,6 +6,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "chrome/browser/ui/views/chrome_views_delegate.h"
 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/views/layout/layout_constants.h"
@@ -23,7 +24,8 @@ LayoutDelegate* LayoutDelegate::Get() {
 int LayoutDelegate::GetMetric(Metric metric) const {
   switch (metric) {
     case Metric::BUTTON_HORIZONTAL_PADDING:
-      return views::kButtonHorizontalPadding;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultDistanceMetric(
+          views::DistanceMetric::BUTTON_HORIZONTAL_PADDING);
     case Metric::BUTTON_MAX_LINKABLE_WIDTH:
       return 0;  // Buttons never expand during layout (add padding instead).
     case Metric::BUTTON_MINIMUM_WIDTH:
@@ -31,19 +33,24 @@ int LayoutDelegate::GetMetric(Metric metric) const {
     case Metric::DIALOG_BUTTON_MARGIN:
       return views::kButtonHEdgeMarginNew;
     case Metric::DIALOG_BUTTON_MINIMUM_WIDTH:
-      return views::kDialogMinimumButtonWidth;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultDistanceMetric(
+          views::DistanceMetric::DIALOG_BUTTON_MINIMUM_WIDTH);
     case Metric::DIALOG_BUTTON_TOP_SPACING:
       return 0;
     case Metric::DIALOG_CLOSE_BUTTON_MARGIN:
-      return views::kCloseButtonMargin;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultDistanceMetric(
+          views::DistanceMetric::CLOSE_BUTTON_MARGIN);
     case Metric::PANEL_CONTENT_MARGIN:
       return views::kPanelHorizMargin;
     case Metric::RELATED_BUTTON_HORIZONTAL_SPACING:
-      return views::kRelatedButtonHSpacing;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultDistanceMetric(
+          views::DistanceMetric::RELATED_BUTTON_HORIZONTAL);
     case Metric::RELATED_CONTROL_HORIZONTAL_SPACING:
-      return views::kRelatedControlHorizontalSpacing;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultDistanceMetric(
+          views::DistanceMetric::RELATED_CONTROL_HORIZONTAL);
     case Metric::RELATED_CONTROL_VERTICAL_SPACING:
-      return views::kRelatedControlVerticalSpacing;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultDistanceMetric(
+          views::DistanceMetric::RELATED_CONTROL_VERTICAL);
     case Metric::RELATED_LABEL_HORIZONTAL_SPACING:
       return views::kItemLabelSpacing;
     case Metric::SUBSECTION_HORIZONTAL_INDENT: