Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/chrome_views_delegate.cc

Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index cba7d894e4a81b55a41dbb03be52cf1b9b9a0fe2..cec24e83e1e533588263e39a3cf4e298ca57944e 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_window_state.h"
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/version_info/version_info.h"
@@ -57,32 +56,19 @@ PrefService* GetPrefsForWindow(const views::Widget* window) {
   return profile->GetPrefs();
 }
 
-ChromeViewsDelegate* views_delegate = nullptr;
+// ChromeViewsDelegate* views_delegate = nullptr;

[Peter Kasting, 2017/04/04 02:08:51]

Remove entirely

[kylix_rd, 2017/04/04 20:28:23]

Done.

 
 }  // namespace
 
 
 // ChromeViewsDelegate --------------------------------------------------------
 
-#if defined(OS_WIN)
-ChromeViewsDelegate::ChromeViewsDelegate()
-    : in_autohide_edges_callback_(false), weak_factory_(this) {
-#else
-ChromeViewsDelegate::ChromeViewsDelegate() {
+#if !defined(OS_WIN)

[Peter Kasting, 2017/04/04 02:08:51]

Nit: Can now probably kill this #ifdef by initializing the remaining Win-only
bits in the class declaration

[kylix_rd, 2017/04/04 20:28:22]

Not sure how to initialize weak_factory_ within the class declaration.

[Peter Kasting, 2017/04/05 19:30:10]

= base::WeakPtrFactory<ChromeViewsDelegate>(this);

?

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

That didn't work. "error: call to deleted constructor of ..."

[Peter Kasting, 2017/04/06 20:05:33]

Weird, I don't know what that error means in this context.  Oh well, not worth
worrying about.

[kylix_rd, 2017/04/07 14:07:58]

The implicit constructor is explicitly deleted with the
DISALLOW_IMPLICIT_CONSTRUCTORS() macro on it's declaration:
https://cs.chromium.org/chromium/src/base/memory/weak_ptr.h?type=cs&l=284

[Peter Kasting, 2017/04/07 18:02:39]

Yeah, but we're calling the explicit (one-arg) constructor.

Unless this requires the availability of the copy constructor as well... I bet
that's it.

I bet this could be done like this:

  base::WeakPtrFactory<ChromeViewsDelegate> weak_factory_{this};

...which would fit the variable initialization guide saying brace-initialization
is fine when other methods won't work or are inconvenient.

[kylix_rd, 2017/04/12 00:03:33]

That worked.

+ChromeViewsDelegate::ChromeViewsDelegate() {}
 #endif
-  DCHECK(!views_delegate);
-  views_delegate = this;
-}
 
 ChromeViewsDelegate::~ChromeViewsDelegate() {
   DCHECK_EQ(0u, ref_count_);
-
-  DCHECK_EQ(this, views_delegate);
-  views_delegate = nullptr;
-}
-
-ChromeViewsDelegate* ChromeViewsDelegate::GetInstance() {
-  return views_delegate;
 }
 
 void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
@@ -209,78 +195,6 @@ ChromeViewsDelegate::GetBlockingPoolTaskRunner() {
   return content::BrowserThread::GetBlockingPool();
 }
 
-gfx::Insets ChromeViewsDelegate::GetInsetsMetric(
-    views::InsetsMetric metric) const {
-  const LayoutDelegate* layout_delegate = LayoutDelegate::Get();
-  switch (metric) {
-    case views::InsetsMetric::DIALOG_BUTTON: {
-      const int top = layout_delegate->GetMetric(
-          LayoutDelegate::Metric::DIALOG_BUTTON_TOP_SPACING);
-      const int margin = layout_delegate->GetMetric(
-          LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN);
-      return gfx::Insets(top, margin, margin, margin);
-    }
-    case views::InsetsMetric::DIALOG_FRAME_VIEW: {
-      const int top = layout_delegate->GetMetric(
-          LayoutDelegate::Metric::PANEL_CONTENT_MARGIN);
-      const int side = layout_delegate->GetMetric(
-          LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN);
-      // Titles are inset at the top and sides, but not at the bottom.
-      return gfx::Insets(top, side, 0, side);
-    }
-    case views::InsetsMetric::BUBBLE_DIALOG:
-      return gfx::Insets(layout_delegate->GetMetric(
-          LayoutDelegate::Metric::PANEL_CONTENT_MARGIN));
-    case views::InsetsMetric::VECTOR_IMAGE_BUTTON_PADDING:
-      return gfx::Insets(layout_delegate->GetMetric(
-          LayoutDelegate::Metric::VECTOR_IMAGE_BUTTON_PADDING));
-  }
-  NOTREACHED();
-  return gfx::Insets();
-}
-
-int ChromeViewsDelegate::GetDistanceMetric(views::DistanceMetric metric) const {
-  switch (metric) {
-    case views::DistanceMetric::CLOSE_BUTTON_MARGIN:
-      return LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::DIALOG_CLOSE_BUTTON_MARGIN);
-    case views::DistanceMetric::RELATED_BUTTON_HORIZONTAL:
-      return LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::RELATED_BUTTON_HORIZONTAL_SPACING);
-    case views::DistanceMetric::RELATED_CONTROL_HORIZONTAL:
-      return LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING);
-    case views::DistanceMetric::RELATED_CONTROL_VERTICAL:
-      return LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING);
-    case views::DistanceMetric::DIALOG_BUTTON_MINIMUM_WIDTH:
-      return LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::DIALOG_BUTTON_MINIMUM_WIDTH);
-    case views::DistanceMetric::BUTTON_HORIZONTAL_PADDING:
-      return LayoutDelegate::Get()->GetMetric(
-          LayoutDelegate::Metric::BUTTON_HORIZONTAL_PADDING);
-  }
-  NOTREACHED();
-  return 0;
-}
-
-const views::TypographyProvider& ChromeViewsDelegate::GetTypographyProvider()
-    const {
-  return LayoutDelegate::Get()->GetTypographyProvider();
-}
-
-int ChromeViewsDelegate::GetDefaultDistanceMetric(
-    views::DistanceMetric metric) {
-  return views_delegate
-             ? views_delegate->InternalGetDefaultDistanceMetric(metric)
-             : views::ViewsDelegate::GetInstance()->GetDistanceMetric(metric);
-}
-
-int ChromeViewsDelegate::InternalGetDefaultDistanceMetric(
-    views::DistanceMetric metric) const {
-  return views::ViewsDelegate::GetDistanceMetric(metric);
-}
-
 #if !defined(OS_CHROMEOS)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(