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

ui/views/views_delegate.h

Index: ui/views/views_delegate.h
diff --git a/ui/views/views_delegate.h b/ui/views/views_delegate.h
index 7b3960f5c7c0a5be23772d6cc4b7d72f7064d5c2..decab5f0c1a7a0e51f5b7ae16b95d06ab6f79a9d 100644
--- a/ui/views/views_delegate.h
+++ b/ui/views/views_delegate.h
@@ -58,6 +58,35 @@ namespace internal {
 class NativeWidgetDelegate;
 }
 
+enum class InsetsMetric {
+  // The insets that should be applied around a DialogClientView. Note that
+  // the top inset is used for the distance between the buttons and the
+  // DialogClientView's content view.
+  DIALOG_BUTTON,
+  // The insets that should be applied around a dialog's frame view.
+  DIALOG_FRAME_VIEW,
+  // The margins that should be applied around a bubble dialog.
+  BUBBLE_DIALOG,

[Peter Kasting, 2017/03/09 05:52:11]

Nit: Alphabetize? (both enums)

[kylix_rd, 2017/03/09 15:02:32]

Done.

+};
+
+enum class DistanceMetric {
+  // The distance between a dialog's edge and the close button in the upper
+  // trailing corner.
+  CLOSE_BUTTON_MARGIN,
+  // The spacing between a pair of related horizontal buttons, used for
+  // dialog layout.
+  RELATED_BUTTON_HORIZONTAL,
+  // Horizontal spacing between controls that are logically related.
+  RELATED_CONTROL_HORIZONTAL,
+  // The spacing between a pair of related vertical controls, used for
+  // dialog layout.
+  RELATED_CONTROL_VERTICAL,
+  // The default minimum width of a dialog button.
+  DIALOG_BUTTON_MINIMUM_WIDTH,
+  // The default padding to add on each side of a button's label.
+  BUTTON_HORIZONTAL_PADDING,
+};
+
 // ViewsDelegate is an interface implemented by an object using the views
 // framework. It is used to obtain various high level application utilities
 // and perform some actions such as window placement saving.
@@ -196,37 +225,12 @@ class VIEWS_EXPORT ViewsDelegate {
   // Returns a blocking pool task runner given a TaskRunnerType.
   virtual scoped_refptr<base::TaskRunner> GetBlockingPoolTaskRunner();
 
-  // Returns the insets that should be applied around a DialogClientView. Note
-  // that the top inset is used for the distance between the buttons and the
-  // DialogClientView's content view.
-  virtual gfx::Insets GetDialogButtonInsets() const;
-
-  // Returns the distance between a dialog's edge and the close button in the
-  // upper trailing corner.
-  virtual int GetDialogCloseButtonMargin() const;
-
-  // Returns the spacing between a pair of related horizontal buttons, used for
-  // dialog layout.
-  virtual int GetDialogRelatedButtonHorizontalSpacing() const;
-
-  // Returns the spacing between a pair of related vertical controls, used for
-  // dialog layout.
-  virtual int GetDialogRelatedControlVerticalSpacing() const;
-
-  // Returns the insets that should be applied around a dialog's frame view.
-  virtual gfx::Insets GetDialogFrameViewInsets() const;
-
-  // Returns the margins that should be applied around a bubble dialog.
-  virtual gfx::Insets GetBubbleDialogMargins() const;
-
-  // Returns the default minimum width of a button.
-  virtual int GetButtonMinimumWidth() const;
-
-  // Returns the minimum width of a dialog button.
-  virtual int GetDialogButtonMinimumWidth() const;
+  // Returns the insets metric according to the given enumeration element.
+  virtual gfx::Insets GetInsetsMetric(InsetsMetric metric) const;
 
-  // Returns the default padding to add on each side of a button's label.
-  virtual int GetButtonHorizontalPadding() const;
+  // Returns the distance metric between elements according to the given
+  // enumeration element.
+  virtual int GetDistanceMetric(DistanceMetric metric) const;
 
  protected:
   ViewsDelegate();