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

ui/views/window/dialog_client_view.cc

 // 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.
 
 #include "ui/views/window/dialog_client_view.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 37 matching lines @@
   if (!button)
     return;
 
   const gfx::Size size = button->GetPreferredSize();
   row_bounds->set_width(row_bounds->width() - size.width());
   DCHECK_LE(button_height, row_bounds->height());
   button->SetBounds(
       row_bounds->right(),
       row_bounds->y() + (row_bounds->height() - button_height) / 2,
       size.width(), button_height);
-  int spacing = ViewsDelegate::GetInstance()
-                    ? ViewsDelegate::GetInstance()
-                          ->GetDialogRelatedButtonHorizontalSpacing()
-                    : kRelatedButtonHSpacing;
+  int spacing =
+      ViewsDelegate::GetInstance()
+          ? ViewsDelegate::GetInstance()->GetSpacingMetric(
+                ViewsDelegate::SpacingMetric::RELATED_HORIZONTAL_BUTTON)
+          : kRelatedButtonHSpacing;
   row_bounds->set_width(row_bounds->width() - spacing);
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, public:
 
 DialogClientView::DialogClientView(Widget* owner, View* contents_view)
     : ClientView(owner, contents_view) {
   button_row_insets_ =
       ViewsDelegate::GetInstance()
-          ? ViewsDelegate::GetInstance()->GetDialogButtonInsets()
+          ? ViewsDelegate::GetInstance()->GetInsetsMetric(
+                ViewsDelegate::InsetsMetric::DIALOG_BUTTON)
           : gfx::Insets(0, kButtonHEdgeMarginNew, kButtonVEdgeMarginNew,
                         kButtonHEdgeMarginNew);
   // Doing this now ensures this accelerator will have lower priority than
   // one set by the contents view.
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
-
-  if (ViewsDelegate::GetInstance())
-    button_row_insets_ = ViewsDelegate::GetInstance()->GetDialogButtonInsets();
 }
 
 DialogClientView::~DialogClientView() {
 }
 
 void DialogClientView::AcceptWindow() {
   // Only notify the delegate once. See |delegate_allowed_close_|'s comment.
   if (!delegate_allowed_close_ && GetDialogDelegate()->Accept()) {
     delegate_allowed_close_ = true;
     GetWidget()->Close();
@@ skipping 57 matching lines @@
   return this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, View overrides:
 
 gfx::Size DialogClientView::GetPreferredSize() const {
   // Initialize the size to fit the buttons and extra view row.
   int extra_view_padding = 0;
   if (!GetDialogDelegate()->GetExtraViewPadding(&extra_view_padding))
-    extra_view_padding = ViewsDelegate::GetInstance()
-                             ? ViewsDelegate::GetInstance()
-                                   ->GetDialogRelatedButtonHorizontalSpacing()
-                             : kRelatedButtonHSpacing;
+    extra_view_padding =
+        ViewsDelegate::GetInstance()
+            ? ViewsDelegate::GetInstance()->GetSpacingMetric(
+                  ViewsDelegate::SpacingMetric::RELATED_HORIZONTAL_BUTTON)
+            : kRelatedButtonHSpacing;
   gfx::Size size(
       (ok_button_ ? ok_button_->GetPreferredSize().width() : 0) +
           (cancel_button_ ? cancel_button_->GetPreferredSize().width() : 0) +
           (cancel_button_ && ok_button_
-           ? (ViewsDelegate::GetInstance()
-                  ? ViewsDelegate::GetInstance()
-                        ->GetDialogRelatedButtonHorizontalSpacing()
-                  : kRelatedButtonHSpacing) : 0) +
-      (ShouldShow(extra_view_) ? extra_view_->GetPreferredSize().width() : 0) +
-      (ShouldShow(extra_view_) && has_dialog_buttons() ? extra_view_padding
-                                                       : 0),
+               ? (ViewsDelegate::GetInstance()
+                      ? ViewsDelegate::GetInstance()->GetSpacingMetric(
+                            ViewsDelegate::SpacingMetric::
+                                RELATED_HORIZONTAL_BUTTON)
+                      : kRelatedButtonHSpacing)
+               : 0) +
+          (ShouldShow(extra_view_) ? extra_view_->GetPreferredSize().width()
+                                   : 0) +
+          (ShouldShow(extra_view_) && has_dialog_buttons() ? extra_view_padding
+                                                           : 0),
       0);
 
   int buttons_height = GetButtonsAndExtraViewRowHeight();
   if (buttons_height != 0) {
     size.Enlarge(0, buttons_height + GetButtonsAndExtraViewRowTopPadding());
     // Inset the buttons and extra view.
     const gfx::Insets insets = GetButtonRowInsets();
     size.Enlarge(insets.width(), insets.height());
   }
 
@@ skipping 182 matching lines @@
 gfx::Insets DialogClientView::GetButtonRowInsets() const {
   return GetButtonsAndExtraViewRowHeight() == 0 ? gfx::Insets()
                                                 : button_row_insets_;
 }
 
 int DialogClientView::GetButtonsAndExtraViewRowTopPadding() const {
   int spacing = button_row_insets_.top();
   // Some subclasses of DialogClientView, in order to do their own layout, set
   // button_row_insets_ to gfx::Insets(). To avoid breaking behavior of those
   // dialogs, supplying 0 for the top inset of the row falls back to
-  // ViewsDelegate::GetRelatedControlVerticalSpacing or
+  // ViewsDelegate::GetSpacingMetric(
+  //     ViewsDelegate::SpacingMetric::RELATED_VERTICAL_CONTROL) or
   // kRelatedControlVerticalSpacing.
   if (!spacing)
     spacing = ViewsDelegate::GetInstance()
-                  ? ViewsDelegate::GetInstance()
-                        ->GetDialogRelatedControlVerticalSpacing()
+                  ? ViewsDelegate::GetInstance()->GetSpacingMetric(
+                        ViewsDelegate::SpacingMetric::RELATED_VERTICAL_CONTROL)
                   : kRelatedControlVerticalSpacing;
   return spacing;
 }
 
 void DialogClientView::SetupFocusChain() {
   // Create a vector of child views in the order of intended focus.
   std::vector<View*> child_views;
   child_views.push_back(contents_view());
   child_views.push_back(extra_view_);
   if (kIsOkButtonOnLeftSide) {
     child_views.push_back(ok_button_);
     child_views.push_back(cancel_button_);
   } else {
     child_views.push_back(cancel_button_);
     child_views.push_back(ok_button_);
   }
 
   // Remove all null views from the vector.
   child_views.erase(
       std::remove(child_views.begin(), child_views.end(), nullptr),
       child_views.end());
 
   // Setup focus by reordering views. It is not safe to use SetNextFocusableView
   // since child views may be added externally to this view.
   for (size_t i = 0; i < child_views.size(); i++)
     ReorderChildView(child_views[i], i);
 }
 
 }  // namespace views