Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/global_error_bubble_view.cc

Index: chrome/browser/ui/views/global_error_bubble_view.cc
diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc
index 948885a11486eabd9dfd34e754e0663a7e4f5b66..eed9dced3526121060d43e36fa0f183b4e174d40 100644
--- a/chrome/browser/ui/views/global_error_bubble_view.cc
+++ b/chrome/browser/ui/views/global_error_bubble_view.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/elevation_icon_setter.h"
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -26,7 +26,6 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
-#include "ui/views/views_delegate.h"
 #include "ui/views/window/dialog_client_view.h"
 
 #if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
@@ -90,7 +89,7 @@ gfx::ImageSkia GlobalErrorBubbleView::GetWindowIcon() {
 }
 
 bool GlobalErrorBubbleView::ShouldShowWindowIcon() const {
-  return LayoutDelegate::Get()->ShouldShowWindowIcon();
+  return ChromeLayoutProvider::Get()->ShouldShowWindowIcon();
 }
 
 void GlobalErrorBubbleView::WindowClosing() {
@@ -127,9 +126,8 @@ void GlobalErrorBubbleView::Init() {
     layout->StartRow(1, 0);
     layout->AddView(message_labels[i]);
     if (i < message_labels.size() - 1)
-      layout->AddPaddingRow(
-          0, views::ViewsDelegate::GetInstance()->GetDistanceMetric(
-                 views::DistanceMetric::RELATED_CONTROL_VERTICAL));
+      layout->AddPaddingRow(0, ChromeLayoutProvider::Get()->GetDistanceMetric(

[Peter Kasting, 2017/04/12 21:37:43]

Nit: I guess this could be LayoutProvider::Get()?

[kylix_rd, 2017/04/13 16:45:42]

Technically, yes. ChromeLayoutProvider already had to be used in
ShouldShowWindowIcon() above, so the same is here for consistency.

+                                   views::DISTANCE_RELATED_CONTROL_VERTICAL));
   }
 
   // These bubbles show at times where activation is sporadic (like at startup,