Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/chrome_views_delegate.h

Index: chrome/browser/ui/views/chrome_views_delegate.h
diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h
index 80ad6b373da050bb14bdecd8e4e3d95b66d2b816..4699d296bf4cffe94a18e85d1022012ab322a844 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.h
+++ b/chrome/browser/ui/views/chrome_views_delegate.h
@@ -10,6 +10,7 @@
 #include "base/location.h"
 #include "base/macros.h"
 #include "build/build_config.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_delegate.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/views/views_delegate.h"
 
@@ -20,8 +21,6 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
   ChromeViewsDelegate();
   ~ChromeViewsDelegate() override;
 
-  static ChromeViewsDelegate* GetInstance();
-
   // views::ViewsDelegate:
   void SaveWindowPlacement(const views::Widget* window,
                            const std::string& window_name,
@@ -60,12 +59,6 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
   std::string GetApplicationName() override;
   scoped_refptr<base::TaskRunner> GetBlockingPoolTaskRunner() override;
 
-  gfx::Insets GetInsetsMetric(views::InsetsMetric metric) const override;
-  int GetDistanceMetric(views::DistanceMetric metric) const override;
-  const views::TypographyProvider& GetTypographyProvider() const override;
-
-  static int GetDefaultDistanceMetric(views::DistanceMetric metric);
-
  private:
 #if defined(OS_WIN)
   typedef std::map<HMONITOR, int> AppbarAutohideEdgeMap;
@@ -84,8 +77,6 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
                                           gfx::Rect* bounds) const;
 #endif
 
-  int InternalGetDefaultDistanceMetric(views::DistanceMetric metric) const;
-
   // Function to retrieve default opacity value mainly based on platform
   // and desktop context.
   views::Widget::InitParams::WindowOpacity GetOpacityForInitParams(
@@ -102,6 +93,9 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
 
   std::unique_ptr<ScopedKeepAlive> keep_alive_;
 
+//  std::unique_ptr<ChromeLayoutDelegate> layout_delegate_ =
+//      base::MakeUnique<ChromeLayoutDelegate>();

[Peter Kasting, 2017/04/06 08:13:36]

Don't add this block

[kylix_rd, 2017/04/06 16:48:19]

It's gone in subsequent patches.

+
 #if defined(OS_WIN)
   AppbarAutohideEdgeMap appbar_autohide_edge_map_;
   // If true we're in the process of notifying a callback from