Rename various LayoutDelegate types/functions for brevity and consistency.

chrome/browser/ui/views/login_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/login_view.h"
 
 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/browser/ui/views/layout_utils.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 40 matching lines @@
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::FIXED, kMessageWidth, 0);
 
   // Add the column set for the user name and password fields and labels.
   const int labels_column_set_id = 1;
   column_set = layout->AddColumnSet(labels_column_set_id);
   if (layout_delegate->UseExtraDialogPadding())
     column_set->AddPaddingColumn(0, kTextfieldStackHorizontalSpacing);
   column_set->AddColumn(layout_delegate->GetControlLabelGridAlignment(),
                         GridLayout::CENTER, 0, GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, layout_delegate->GetLayoutDistance(
-                                   LayoutDelegate::LayoutDistanceType::
-                                       RELATED_CONTROL_HORIZONTAL_SPACING));
+  column_set->AddPaddingColumn(
+      0,
+      layout_delegate->GetMetric(
+          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
   if (layout_delegate->UseExtraDialogPadding())
     column_set->AddPaddingColumn(0, kTextfieldStackHorizontalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(authority_label_);
   if (!explanation.empty()) {
     message_label_ = new views::Label(explanation);
     message_label_->SetMultiLine(true);
     message_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     message_label_->SetAllowCharacterBreak(true);
-    layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
-                                 LayoutDelegate::LayoutDistanceType::
-                                     RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(
+        0,
+        layout_delegate->GetMetric(
+            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
     layout->StartRow(0, single_column_view_set_id);
     layout->AddView(message_label_);
   }
 
-  layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
-                               LayoutDelegate::LayoutDistanceType::
-                                   UNRELATED_CONTROL_VERTICAL_SPACING_LARGE));
+  layout->AddPaddingRow(
+      0,
+      layout_delegate->GetMetric(
+          LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE));
 
   layout->StartRow(0, labels_column_set_id);
   layout->AddView(username_label_);
   layout->AddView(username_field_);
 
-  layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
-                               LayoutDelegate::LayoutDistanceType::
-                                   RELATED_CONTROL_VERTICAL_SPACING));
+  layout->AddPaddingRow(
+      0,
+      layout_delegate->GetMetric(
+          LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
 
   layout->StartRow(0, labels_column_set_id);
   layout->AddView(password_label_);
   layout->AddView(password_field_);
 
   if (layout_delegate->UseExtraDialogPadding()) {
-    layout->AddPaddingRow(0, layout_delegate->GetLayoutDistance(
-                                 LayoutDelegate::LayoutDistanceType::
-                                     UNRELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(
+        0,
+        layout_delegate->GetMetric(
+            LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING));
   }
 
   if (login_model_data) {
     login_model_->AddObserverAndDeliverCredentials(this,
                                                    login_model_data->form);
   }
 }
 
 LoginView::~LoginView() {
   if (login_model_)
@@ skipping 27 matching lines @@
 
 void LoginView::OnLoginModelDestroying() {
   login_model_->RemoveObserver(this);
   login_model_ = NULL;
 }
 
 const char* LoginView::GetClassName() const {
   return "LoginView";
 }