Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/window/dialog_client_view.cc

Index: ui/views/window/dialog_client_view.cc
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index 5d543a7572efe2b85b8772f293c766cbdb19430f..01ce622d1cb966a77aa69d21d14bebc9d2f77b54 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -16,8 +16,8 @@
 #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_delegate.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"
 
@@ -75,8 +75,8 @@ class DialogClientView::ButtonRowContainer : public View {
 
 DialogClientView::DialogClientView(Widget* owner, View* contents_view)
     : ClientView(owner, contents_view),
-      button_row_insets_(ViewsDelegate::GetInstance()->GetInsetsMetric(
-          InsetsMetric::DIALOG_BUTTON)) {
+      button_row_insets_(
+          LayoutDelegate::Get()->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));
@@ -281,7 +281,7 @@ void DialogClientView::UpdateDialogButton(LabelButton** member,
       button = MdTextButton::CreateSecondaryUiButton(this, title);
     }
 
-    const int minimum_width = ViewsDelegate::GetInstance()->GetDistanceMetric(
+    const int minimum_width = LayoutDelegate::Get()->GetDistanceMetric(
         views::DistanceMetric::DIALOG_BUTTON_MINIMUM_WIDTH);
     button->SetMinSize(gfx::Size(minimum_width, 0));
 
@@ -301,7 +301,7 @@ int DialogClientView::GetExtraViewSpacing() const {
   if (GetDialogDelegate()->GetExtraViewPadding(&extra_view_padding))
     return extra_view_padding;
 
-  return ViewsDelegate::GetInstance()->GetDistanceMetric(
+  return LayoutDelegate::Get()->GetDistanceMetric(
       views::DistanceMetric::RELATED_BUTTON_HORIZONTAL);
 }
 
@@ -341,7 +341,7 @@ void DialogClientView::SetupLayout() {
   // They expect GetDialogRelatedControlVerticalSpacing() in this case.
   // TODO(tapted): Remove this under Harmony.
   if (insets.top() == 0) {
-    const int top = ViewsDelegate::GetInstance()->GetDistanceMetric(
+    const int top = LayoutDelegate::Get()->GetDistanceMetric(
         views::DistanceMetric::RELATED_CONTROL_VERTICAL);
     insets.Set(top, insets.left(), insets.bottom(), insets.right());
   }
@@ -356,7 +356,7 @@ void DialogClientView::SetupLayout() {
   // GetExtraViewSpacing() handles <pad+stretchy>.
   const int button_spacing =
       (ok_button_ && cancel_button_)
-          ? ViewsDelegate::GetInstance()->GetDistanceMetric(
+          ? LayoutDelegate::Get()->GetDistanceMetric(
                 views::DistanceMetric::RELATED_BUTTON_HORIZONTAL)
           : 0;