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 1f80b8776d9492dc62e1618e34ede4c13608d15f..97c6942efc5979baa149402f70590c4156cc52e7 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,25 +24,33 @@ LayoutDelegate* LayoutDelegate::Get() {
 int LayoutDelegate::GetMetric(Metric metric) const {
   switch (metric) {
     case Metric::BUTTON_HORIZONTAL_PADDING:
-      return views::kButtonHorizontalPadding;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultSpacingMetric(

[Peter Kasting, 2017/03/03 00:05:55]

I wonder if it would make more sense to just leave the direct views::kConstant
usage here and avoid introducing GetDefaultSpacingMetric() at all.

Yes, it duplicates the constant usages between ViewsDelegate and here.  But if
the subsequent plan is to hoist LayoutDelegate to the views layer and remove
these accessors from ViewsDelegate entirely, then we'll just have to put those
constants back in here anyway.

+          views::SpacingMetric::BUTTON_HORIZONTAL_PADDING);
     case Metric::BUTTON_MINIMUM_WIDTH:
       return views::kMinimumButtonWidth;
     case Metric::DIALOG_BUTTON_MARGIN:
       return views::kButtonHEdgeMarginNew;
     case Metric::DIALOG_BUTTON_MINIMUM_WIDTH:
-      return views::kDialogMinimumButtonWidth;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultSpacingMetric(
+          views::SpacingMetric::DIALOG_BUTTON_MINIMUM_WIDTH);
     case Metric::DIALOG_BUTTON_TOP_SPACING:
       return 0;
     case Metric::DIALOG_CLOSE_BUTTON_MARGIN:
-      return views::kCloseButtonMargin;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultSpacingMetric(
+          views::SpacingMetric::CLOSE_BUTTON_MARGIN);
+    case Metric::ICON_TEXT_SPACING:
+      return ChromeViewsDelegate::GetInstance()->GetDefaultSpacingMetric(
+          views::SpacingMetric::ICON_TO_TEXT);
     case Metric::PANEL_CONTENT_MARGIN:
       return views::kPanelHorizMargin;
     case Metric::RELATED_BUTTON_HORIZONTAL_SPACING:
-      return views::kRelatedButtonHSpacing;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultSpacingMetric(
+          views::SpacingMetric::RELATED_HORIZONTAL_BUTTON);
     case Metric::RELATED_CONTROL_HORIZONTAL_SPACING:
       return views::kRelatedControlHorizontalSpacing;
     case Metric::RELATED_CONTROL_VERTICAL_SPACING:
-      return views::kRelatedControlVerticalSpacing;
+      return ChromeViewsDelegate::GetInstance()->GetDefaultSpacingMetric(
+          views::SpacingMetric::RELATED_VERTICAL_CONTROL);
     case Metric::RELATED_LABEL_HORIZONTAL_SPACING:
       return views::kItemLabelSpacing;
     case Metric::SUBSECTION_HORIZONTAL_INDENT: