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

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

 // Copyright 2016 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 "chrome/browser/ui/views/harmony/layout_delegate.h"
 
 #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"
 
 static base::LazyInstance<LayoutDelegate> layout_delegate_ =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 LayoutDelegate* LayoutDelegate::Get() {
   return ui::MaterialDesignController::IsSecondaryUiMaterial()
              ? HarmonyLayoutDelegate::Get()
              : layout_delegate_.Pointer();
 }
 
 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:
       return views::kCheckboxIndent;
     case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING:
       return views::kUnrelatedControlHorizontalSpacing;
     case Metric::UNRELATED_CONTROL_HORIZONTAL_SPACING_LARGE:
       return views::kUnrelatedControlLargeHorizontalSpacing;
     case Metric::UNRELATED_CONTROL_VERTICAL_SPACING:
       return views::kUnrelatedControlVerticalSpacing;
@@ skipping 13 matching lines @@
   return true;
 }
 
 bool LayoutDelegate::IsHarmonyMode() const {
   return false;
 }
 
 int LayoutDelegate::GetDialogPreferredWidth(DialogWidth width) const {
   return 0;
 }