Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc

 // Copyright 2016 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/toolbar/toolbar_actions_bar_bubble_views.h"
 
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/locale_settings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.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/controls/link.h"
 #include "ui/views/layout/box_layout.h"
 
@@ skipping 47 matching lines @@
       link_ = new views::Link(text);
       link_->set_listener(this);
       label.reset(link_);
     } else {
       label.reset(new views::Label(text));
     }
   }
 
   if (icon && label) {
     views::View* parent = new views::View();
-    parent->SetLayoutManager(new views::BoxLayout(
-        views::BoxLayout::kHorizontal, 0, 0,
-        LayoutDelegate::Get()->GetMetric(
-            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING)));
+    parent->SetLayoutManager(
+        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
+                             ChromeLayoutProvider::Get()->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL)));
     parent->AddChildView(icon.release());
     parent->AddChildView(label.release());
     return parent;
   }
 
   return icon ? static_cast<views::View*>(icon.release())
               : static_cast<views::View*>(label.release());
 }
 
 base::string16 ToolbarActionsBarBubbleViews::GetWindowTitle() const {
@@ skipping 10 matching lines @@
   delegate_->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE);
   return true;
 }
 
 bool ToolbarActionsBarBubbleViews::Close() {
   delegate_->OnBubbleClosed(close_reason_);
   return true;
 }
 
 void ToolbarActionsBarBubbleViews::Init() {
-  LayoutDelegate* delegate = LayoutDelegate::Get();
+  ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, 0, 0,
-      delegate->GetMetric(
-          LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING)));
+      provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL)));
 
   // Add the content string.
   views::Label* content_label =
       new views::Label(delegate_->GetBodyText(anchored_to_action_));
   content_label->SetMultiLine(true);
   int width = views::Widget::GetLocalizedContentsWidth(
         IDS_EXTENSION_TOOLBAR_REDESIGN_NOTIFICATION_BUBBLE_WIDTH_CHARS);
   content_label->SizeToFit(width);
   content_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(content_label);
 
   base::string16 item_list = delegate_->GetItemListText();
 
   if (!item_list.empty()) {
     item_list_ = new views::Label(item_list);
     item_list_->SetBorder(views::CreateEmptyBorder(
         0,
-        delegate->GetMetric(
-            LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING),
+        provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_HORIZONTAL),
         0, 0));
     item_list_->SetMultiLine(true);
     item_list_->SizeToFit(width);
     item_list_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(item_list_);
   }
 }
 
 int ToolbarActionsBarBubbleViews::GetDialogButtons() const {
   int buttons = ui::DIALOG_BUTTON_NONE;
@@ skipping 14 matching lines @@
     ui::DialogButton button) const {
   return button == ui::DIALOG_BUTTON_OK ? delegate_->GetActionButtonText()
                                         : delegate_->GetDismissButtonText();
 }
 
 void ToolbarActionsBarBubbleViews::LinkClicked(views::Link* link,
                                                int event_flags) {
   close_reason_ = ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE;
   GetWidget()->Close();
 }