Rename various LayoutDelegate types/functions for brevity and consistency.

chrome/browser/ui/views/bookmarks/bookmark_editor_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/bookmarks/bookmark_editor_view.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 334 matching lines @@
   LayoutDelegate* delegate = LayoutDelegate::Get();
 
   const int labels_column_set_id = 0;
   const int single_column_view_set_id = 1;
   const int buttons_column_set_id = 2;
 
   views::ColumnSet* column_set = layout->AddColumnSet(labels_column_set_id);
   column_set->AddColumn(delegate->GetControlLabelGridAlignment(),
                         GridLayout::CENTER, 0, GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(
-      0, delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
-                                         RELATED_CONTROL_HORIZONTAL_SPACING));
+      0,

[Elly Fong-Jones, 2017/01/31 15:42:14]

is this what 'git cl format' does?

[Peter Kasting, 2017/01/31 21:41:55]

Yes.  I was surprised.

+      delegate->GetMetric(
+          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   column_set = layout->AddColumnSet(buttons_column_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(
-      1, delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
-                                         RELATED_CONTROL_HORIZONTAL_SPACING));
+      1,
+      delegate->GetMetric(
+          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(
-      0, delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
-                                         RELATED_CONTROL_HORIZONTAL_SPACING));
+      0,
+      delegate->GetMetric(
+          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->LinkColumnSizes(0, 2, 4, -1);
 
   layout->StartRow(0, labels_column_set_id);
   layout->AddView(title_label_);
   layout->AddView(title_tf_);
 
   if (details_.GetNodeType() != BookmarkNode::FOLDER) {
     url_label_ = new views::Label(
         l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_URL_LABEL));
 
     url_tf_ = new views::Textfield;
     url_tf_->SetText(chrome::FormatBookmarkURLForDisplay(url));
     url_tf_->set_controller(this);
     url_tf_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_BOOKMARK_AX_EDITOR_URL_LABEL));
 
     layout->AddPaddingRow(
-        0, delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
-                                           RELATED_CONTROL_VERTICAL_SPACING));
+        0,
+        delegate->GetMetric(
+            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
 
     layout->StartRow(0, labels_column_set_id);
     layout->AddView(url_label_);
     layout->AddView(url_tf_);
   }
 
   if (show_tree_) {
     layout->AddPaddingRow(
-        0, delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
-                                           RELATED_CONTROL_VERTICAL_SPACING));
+        0,
+        delegate->GetMetric(
+            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
     layout->StartRow(1, single_column_view_set_id);
     layout->AddView(tree_view_->CreateParentIfNecessary());
   }
 
   if (delegate->UseExtraDialogPadding()) {
     layout->AddPaddingRow(
-        0, delegate->GetLayoutDistance(LayoutDelegate::LayoutDistanceType::
-                                           RELATED_CONTROL_VERTICAL_SPACING));
+        0,
+        delegate->GetMetric(
+            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
   }
 
   if (!show_tree_ || bb_model_->loaded())
     Reset();
 }
 
 void BookmarkEditorView::Reset() {
   if (!show_tree_) {
     if (parent())
       UserInputChanged();
@@ skipping 246 matching lines @@
                              Profile* profile,
                              const BookmarkEditor::EditDetails& details,
                              BookmarkEditor::Configuration configuration) {
   DCHECK(profile);
   BookmarkEditorView* editor = new BookmarkEditorView(
       profile, details.parent_node, details, configuration);
   editor->Show(parent_window);
 }
 
 }  // namespace chrome