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

ui/views/views_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_VIEWS_VIEWS_DELEGATE_H_
 #define UI_VIEWS_VIEWS_DELEGATE_H_
 
 #include <string>
 
 #if defined(OS_WIN)
@@ skipping 40 matching lines @@
 class Widget;
 
 #if defined(USE_AURA)
 class TouchSelectionMenuRunnerViews;
 #endif
 
 namespace internal {
 class NativeWidgetDelegate;
 }
 
+enum class InsetsMetric {
+  // The margins that should be applied around a bubble dialog.
+  BUBBLE_DIALOG,
+  // 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,
+};
+
+enum class DistanceMetric {
+  // The default padding to add on each side of a button's label.
+  BUTTON_HORIZONTAL_PADDING,
+  // The distance between a dialog's edge and the close button in the upper
+  // trailing corner.
+  CLOSE_BUTTON_MARGIN,
+  // The default minimum width of a dialog button.
+  DIALOG_BUTTON_MINIMUM_WIDTH,
+  // 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,
+};
+
 // 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.
 //
 // The embedding app must set the ViewsDelegate instance by instantiating an
 // implementation of ViewsDelegate (the constructor will set the instance).
 class VIEWS_EXPORT ViewsDelegate {
  public:
   using NativeWidgetFactory =
       base::Callback<NativeWidget*(const Widget::InitParams&,
@@ skipping 118 matching lines @@
   // not changed, |callback| is never run.
   //
   // The return value is a bitmask of AppbarAutohideEdge.
   virtual int GetAppbarAutohideEdges(HMONITOR monitor,
                                      const base::Closure& callback);
 #endif
 
   // 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 insets metric according to the given enumeration element.
+  virtual gfx::Insets GetInsetsMetric(InsetsMetric metric) 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 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();
 
  private:
   std::unique_ptr<ViewsTouchEditingControllerFactory> views_tsc_factory_;
 
 #if defined(USE_AURA)
   std::unique_ptr<TouchSelectionMenuRunnerViews> touch_selection_menu_runner_;
 #endif
 
   NativeWidgetFactory native_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsDelegate);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_VIEWS_DELEGATE_H_