Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/global_error_bubble_view.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 "chrome/browser/ui/views/global_error_bubble_view.h"
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #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"
 #include "ui/base/ui_features.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #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)
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #endif
 
 namespace {
 
 const int kMaxBubbleViewWidth = 362;
 
@@ skipping 43 matching lines @@
 gfx::ImageSkia GlobalErrorBubbleView::GetWindowIcon() {
   gfx::Image image;
   if (error_) {
     image = error_->GetBubbleViewIcon();
     DCHECK(!image.IsEmpty());
   }
   return *image.ToImageSkia();
 }
 
 bool GlobalErrorBubbleView::ShouldShowWindowIcon() const {
-  return LayoutDelegate::Get()->ShouldShowWindowIcon();
+  return ChromeLayoutProvider::Get()->ShouldShowWindowIcon();
 }
 
 void GlobalErrorBubbleView::WindowClosing() {
   if (error_)
     error_->BubbleViewDidClose(browser_);
 }
 
 void GlobalErrorBubbleView::Init() {
   // |error_| is assumed to be valid, and stay valid, at least until Init()
   // returns.
@@ skipping 16 matching lines @@
 
   // First row, message labels.
   views::ColumnSet* cs = layout->AddColumnSet(0);
   cs->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                 views::GridLayout::FIXED, kMaxBubbleViewWidth, 0);
 
   for (size_t i = 0; i < message_labels.size(); ++i) {
     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,
   // or a new window opening). Make sure the bubble doesn't disappear before the
   // user sees it, if the bubble needs to be acknowledged.
   set_close_on_deactivate(error_->ShouldCloseOnDeactivate());
 }
 
 void GlobalErrorBubbleView::UpdateButton(views::LabelButton* button,
                                          ui::DialogButton type) {
@@ skipping 49 matching lines @@
 }
 
 bool GlobalErrorBubbleView::Close() {
   // Don't fall through to either Cancel() or Accept().
   return true;
 }
 
 void GlobalErrorBubbleView::CloseBubbleView() {
   GetWidget()->Close();
 }