Rename various LayoutDelegate types/functions for brevity and consistency.

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/toolbar/toolbar_actions_bar_bubble_delegate.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/grit/locale_settings.h"
@@ skipping 51 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()->GetLayoutDistance(
-                                 LayoutDelegate::LayoutDistanceType::
-                                     RELATED_CONTROL_VERTICAL_SPACING)));
+    parent->SetLayoutManager(new views::BoxLayout(
+        views::BoxLayout::kHorizontal, 0, 0,
+        LayoutDelegate::Get()->GetMetric(
+            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING)));
     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 16 matching lines @@
     delegate_->OnBubbleClosed(
         ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION);
   }
   return true;
 }
 
 void ToolbarActionsBarBubbleViews::Init() {
   LayoutDelegate* delegate = LayoutDelegate::Get();
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, 0, 0,
-      delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
-                                      RELATED_CONTROL_VERTICAL_SPACING)));
+      delegate->GetMetric(
+          LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING)));
 
   // Add the content string.
   views::Label* content_label = new views::Label(
       delegate_->GetBodyText(GetAnchorView()->id() == VIEW_ID_BROWSER_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->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
-                                           RELATED_CONTROL_HORIZONTAL_SPACING),
+        0,
+        delegate->GetMetric(
+            LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING),
         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 16 matching lines @@
                                         : delegate_->GetDismissButtonText();
 }
 
 void ToolbarActionsBarBubbleViews::LinkClicked(views::Link* link,
                                                int event_flags) {
   delegate_->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE);
   // Reset delegate so we don't send extra OnBubbleClosed()s.
   delegate_.reset();
   GetWidget()->Close();
 }