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

ui/views/views_delegate.cc

 // Copyright (c) 2013 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/views_delegate.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/views_touch_selection_controller_factory.h"
 #include "ui/views/widget/native_widget_private.h"
 
 #if defined(USE_AURA)
 #include "ui/views/touchui/touch_selection_menu_runner_views.h"
 #endif
 
 namespace views {
 namespace {
 
 ViewsDelegate* views_delegate = nullptr;
 
+// Horizontal spacing between the image of a label button and its text. This
+// affects checkboxes and radiobuttons.
+constexpr int kIconTextSpacing = 5;

[Peter Kasting, 2017/03/01 06:32:36]

Nit: Can be defined in the function below that uses this

 }
 
 ViewsDelegate::~ViewsDelegate() {
   ui::TouchEditingControllerFactory::SetInstance(nullptr);
 
   DCHECK_EQ(this, views_delegate);
   views_delegate = nullptr;
 }
 
 ViewsDelegate* ViewsDelegate::GetInstance() {
@@ skipping 87 matching lines @@
 int ViewsDelegate::GetAppbarAutohideEdges(HMONITOR monitor,
                                           const base::Closure& callback) {
   return EDGE_BOTTOM;
 }
 #endif
 
 scoped_refptr<base::TaskRunner> ViewsDelegate::GetBlockingPoolTaskRunner() {
   return nullptr;
 }
 
-gfx::Insets ViewsDelegate::GetDialogButtonInsets() const {
-  return gfx::Insets(0, kButtonHEdgeMarginNew, kButtonVEdgeMarginNew,
-                     kButtonHEdgeMarginNew);
+gfx::Insets ViewsDelegate::GetInsetsMetric(InsetsMetric metric) const {
+  switch (metric) {
+    case InsetsMetric::DIALOG_BUTTON:
+      return gfx::Insets(0, kButtonHEdgeMarginNew, kButtonVEdgeMarginNew,
+                         kButtonHEdgeMarginNew);
+    case InsetsMetric::DIALOG_FRAME_VIEW:
+      return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew, 0,
+                         kButtonHEdgeMarginNew);
+    case InsetsMetric::BUBBLE_DIALOG:
+      return gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
+  }
+  NOTREACHED();
+  return gfx::Insets();
 }
 
-int ViewsDelegate::GetDialogCloseButtonMargin() const {
-  return kCloseButtonMargin;
+int ViewsDelegate::GetSpacingMetric(SpacingMetric metric) const {
+  return GetDefaultSpacingMetric(metric);
 }
 
-int ViewsDelegate::GetDialogRelatedButtonHorizontalSpacing() const {
-  return kRelatedButtonHSpacing;
-}
-
-int ViewsDelegate::GetDialogRelatedControlVerticalSpacing() const {
-  return kRelatedControlVerticalSpacing;
-}
-
-gfx::Insets ViewsDelegate::GetDialogFrameViewInsets() const {
-  return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew, 0,
-                     kButtonHEdgeMarginNew);
-}
-
-gfx::Insets ViewsDelegate::GetBubbleDialogMargins() const {
-  return gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
-}
-
-int ViewsDelegate::GetButtonMinimumWidth() const {
-  return kMinimumButtonWidth;
-}
-
-int ViewsDelegate::GetDialogButtonMinimumWidth() const {
-  return kDialogMinimumButtonWidth;
-}
-
-int ViewsDelegate::GetButtonHorizontalPadding() const {
-  return kButtonHorizontalPadding;
+int ViewsDelegate::GetDefaultSpacingMetric(SpacingMetric metric) {
+  switch (metric) {
+    case SpacingMetric::CLOSE_BUTTON_MARGIN:
+      return kCloseButtonMargin;
+    case SpacingMetric::RELATED_HORIZONTAL_BUTTON:
+      return kRelatedButtonHSpacing;
+    case SpacingMetric::RELATED_VERTICAL_CONTROL:
+      return kRelatedControlVerticalSpacing;
+    case SpacingMetric::ICON_TO_TEXT:
+      return kIconTextSpacing;
+    case SpacingMetric::DIALOG_BUTTON_MINIMUM_WIDTH:
+      return kDialogMinimumButtonWidth;
+    case SpacingMetric::BUTTON_HORIZONTAL_PADDING:
+      return kButtonHorizontalPadding;
+  }
+  NOTREACHED();
+  return 0;
 }
 
 ViewsDelegate::ViewsDelegate()
     : views_tsc_factory_(new ViewsTouchEditingControllerFactory) {
   DCHECK(!views_delegate);
   views_delegate = this;
 
   ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get());
 
 #if defined(USE_AURA)
   touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews());
 #endif
 }
 
 }  // namespace views