Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/layout/grid_layout.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/layout/grid_layout.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/views/layout/layout_constants.h"
+#include "ui/views/layout/layout_delegate.h"
 #include "ui/views/view.h"
-#include "ui/views/views_delegate.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 
 // LayoutElement ------------------------------------------------------
 
 // A LayoutElement has a size and location along one axis. It contains
 // methods that are used along both axis.
 class LayoutElement {
  public:
@@ skipping 621 matching lines @@
   DCHECK(host);
 }
 
 GridLayout::~GridLayout() {
 }
 
 // static
 GridLayout* GridLayout::CreatePanel(View* host) {
   GridLayout* layout = new GridLayout(host);
   layout->SetInsets(
-      ViewsDelegate::GetInstance()->GetInsetsMetric(InsetsMetric::PANEL));
+      LayoutDelegate::Get()->GetInsetsMetric(InsetsMetric::PANEL));
   host->SetLayoutManager(layout);
   return layout;
 }
 
 void GridLayout::SetInsets(int top, int left, int bottom, int right) {
   insets_.Set(top, left, bottom, right);
 }
 
 void GridLayout::SetInsets(const gfx::Insets& insets) {
   insets_ = insets;
@@ skipping 361 matching lines @@
 
 ColumnSet* GridLayout::GetLastValidColumnSet() {
   for (int i = current_row_ - 1; i >= 0; --i) {
     if (rows_[i]->column_set())
       return rows_[i]->column_set();
   }
   return nullptr;
 }
 
 }  // namespace views