Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/harmony/harmony_layout_delegate.h

Index: chrome/browser/ui/views/harmony/harmony_layout_delegate.h
diff --git a/chrome/browser/ui/views/harmony/harmony_layout_delegate.h b/chrome/browser/ui/views/harmony/harmony_layout_delegate.h
index c750bfffc62dbb7eedceb24c7d8d4588b396fdc0..5a7f6147e8d85f4e0f6e3346194d3c6c3052ebd5 100644
--- a/chrome/browser/ui/views/harmony/harmony_layout_delegate.h
+++ b/chrome/browser/ui/views/harmony/harmony_layout_delegate.h
@@ -1,13 +1,14 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2017 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 CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_LAYOUT_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_LAYOUT_DELEGATE_H_
 
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
+#include "base/macros.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_delegate.h"
 
-class HarmonyLayoutDelegate : public LayoutDelegate {
+class HarmonyLayoutDelegate : public ChromeLayoutDelegate {
  public:
   // The Harmony layout unit. All distances are in terms of this unit.
   static constexpr int kHarmonyLayoutUnit = 16;
@@ -15,16 +16,13 @@ class HarmonyLayoutDelegate : public LayoutDelegate {
   HarmonyLayoutDelegate() {}
   ~HarmonyLayoutDelegate() override {}
 
-  // Returns the singleton HarmonyLayoutDelegate instance.
-  static HarmonyLayoutDelegate* Get();
-
-  // views::LayoutDelegate:
-  int GetMetric(Metric metric) const override;
+  gfx::Insets GetInsetsMetric(ChromeInsetsMetric metric) const override;
+  int GetDistanceMetric(ChromeDistanceMetric metric) const override;
   views::GridLayout::Alignment GetControlLabelGridAlignment() const override;
   bool UseExtraDialogPadding() const override;
+  bool ShouldShowWindowIcon() const override;
   bool IsHarmonyMode() const override;
   int GetDialogPreferredWidth(DialogWidth width) const override;
-  bool ShouldShowWindowIcon() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HarmonyLayoutDelegate);