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"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/layout/grid_layout.h"
+#include "ui/views/layout/layout_constants.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 
 namespace {
 
 // The group used by the buttons.  This name is chosen voluntarily big not to
@@ skipping 39 matching lines @@
   DialogClientView* const owner_;
 
   DISALLOW_COPY_AND_ASSIGN(ButtonRowContainer);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, public:
 
 DialogClientView::DialogClientView(Widget* owner, View* contents_view)
     : ClientView(owner, contents_view),
-      button_row_insets_(
-          ViewsDelegate::GetInstance()->GetDialogButtonInsets()) {
+      button_row_insets_(ViewsDelegate::GetInstance()->GetInsetsMetric(
+          InsetsMetric::DIALOG_BUTTON)) {
   // 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));
   button_row_container_ = new ButtonRowContainer(this);
   AddChildView(button_row_container_);
 }
 
 DialogClientView::~DialogClientView() {}
 
 void DialogClientView::AcceptWindow() {
@@ skipping 184 matching lines @@
                              PlatformStyle::kDialogDefaultButtonCanBeCancel);
 
     // The default button is always blue in Harmony.
     if (is_default && (ui::MaterialDesignController::IsSecondaryUiMaterial() ||
                        delegate->ShouldDefaultButtonBeBlue())) {
       button = MdTextButton::CreateSecondaryUiBlueButton(this, title);
     } else {
       button = MdTextButton::CreateSecondaryUiButton(this, title);
     }
 
-    const int minimum_width =
-        ViewsDelegate::GetInstance()->GetDialogButtonMinimumWidth();
+    const int minimum_width = ViewsDelegate::GetInstance()->GetDistanceMetric(
+        views::DistanceMetric::DIALOG_BUTTON_MINIMUM_WIDTH);
     button->SetMinSize(gfx::Size(minimum_width, 0));
 
     button->SetGroup(kButtonGroup);
 
     *member = button;
   }
 
   delegate->UpdateButton(*member, type);
 }
 
 int DialogClientView::GetExtraViewSpacing() const {
   if (!ShouldShow(extra_view_) || !(ok_button_ || cancel_button_))
     return 0;
 
   int extra_view_padding = 0;
   if (GetDialogDelegate()->GetExtraViewPadding(&extra_view_padding))
     return extra_view_padding;
 
-  return ViewsDelegate::GetInstance()
-      ->GetDialogRelatedButtonHorizontalSpacing();
+  return ViewsDelegate::GetInstance()->GetDistanceMetric(
+      views::DistanceMetric::RELATED_BUTTON_HORIZONTAL);
 }
 
 std::array<View*, DialogClientView::kNumButtons>
 DialogClientView::GetButtonRowViews() {
   View* first = ShouldShow(extra_view_) ? extra_view_ : nullptr;
   View* second = cancel_button_;
   View* third = ok_button_;
   if (kIsOkButtonOnLeftSide)
     std::swap(second, third);
   return {{first, second, third}};
@@ skipping 18 matching lines @@
     AddChildView(extra_view_);
 
   if (std::count(views.begin(), views.end(), nullptr) == kNumButtons)
     return;
 
   gfx::Insets insets = button_row_insets_;
   // Support dialogs that clear |button_row_insets_| to do their own layout.
   // They expect GetDialogRelatedControlVerticalSpacing() in this case.
   // TODO(tapted): Remove this under Harmony.
   if (insets.top() == 0) {
-    const int top =
-        ViewsDelegate::GetInstance()->GetDialogRelatedControlVerticalSpacing();
+    const int top = ViewsDelegate::GetInstance()->GetDistanceMetric(
+        views::DistanceMetric::RELATED_CONTROL_VERTICAL);
     insets.Set(top, insets.left(), insets.bottom(), insets.right());
   }
 
   // The |resize_percent| constants. There's only one stretchy column (padding
   // to the left of ok/cancel buttons).
   constexpr float kFixed = 0.f;
   constexpr float kStretchy = 1.f;
 
   // Button row is [ extra <pad+stretchy> second <pad> third ]. Ensure the <pad>
   // column is zero width if there isn't a button on either side.
   // GetExtraViewSpacing() handles <pad+stretchy>.
   const int button_spacing =
       (ok_button_ && cancel_button_)
-          ? ViewsDelegate::GetInstance()
-                ->GetDialogRelatedButtonHorizontalSpacing()
+          ? ViewsDelegate::GetInstance()->GetDistanceMetric(
+                views::DistanceMetric::RELATED_BUTTON_HORIZONTAL)
           : 0;
 
   constexpr int kButtonRowId = 0;
   ColumnSet* column_set = layout->AddColumnSet(kButtonRowId);
 
   // Rather than giving |button_row_container_| a Border, incorporate the insets
   // into the layout. This simplifies min/max size calculations.
   column_set->AddPaddingColumn(kFixed, insets.left());
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, kFixed,
                         GridLayout::USE_PREF, 0, 0);
@@ skipping 42 matching lines @@
 
   if (extra_view_)
     return;
 
   extra_view_ = GetDialogDelegate()->CreateExtraView();
   if (extra_view_)
     extra_view_->SetGroup(kButtonGroup);
 }
 
 }  // namespace views