Rename various LayoutDelegate types/functions for brevity and consistency.

chrome/browser/ui/views/cookie_info_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/cookie_info_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 129 matching lines @@
       l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_LABEL));
   send_for_value_field_ = new views::Textfield;
   created_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_CREATED_LABEL));
   created_value_field_ = new views::Textfield;
   expires_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_LABEL));
   expires_value_field_ = new views::Textfield;
 
   views::GridLayout* layout = new views::GridLayout(this);
-  layout->SetInsets(
-      0, LayoutDelegate::Get()->GetLayoutDistance(
-             LayoutDelegate::LayoutDistanceType::DIALOG_BUTTON_MARGIN),
-      0, LayoutDelegate::Get()->GetLayoutDistance(
-             LayoutDelegate::LayoutDistanceType::DIALOG_BUTTON_MARGIN));
+  layout->SetInsets(0,
+                    LayoutDelegate::Get()->GetMetric(
+                        LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN),
+                    0,
+                    LayoutDelegate::Get()->GetMetric(
+                        LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN));
   SetLayoutManager(layout);
 
   int three_column_layout_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(three_column_layout_id);
   column_set->AddColumn(LayoutDelegate::Get()->GetControlLabelGridAlignment(),
                         views::GridLayout::CENTER, 0,
                         views::GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, LayoutDelegate::Get()->GetLayoutDistance(
-                                      LayoutDelegate::LayoutDistanceType::
-                                          RELATED_CONTROL_HORIZONTAL_SPACING));
+  column_set->AddPaddingColumn(
+      0,
+      LayoutDelegate::Get()->GetMetric(
+          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
   column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
                         0, views::GridLayout::USE_PREF, 0, 0);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                         1, views::GridLayout::USE_PREF, 0, 0);
 
   AddLabelRow(three_column_layout_id, layout, name_label_, name_value_field_);
   AddLabelRow(three_column_layout_id, layout, content_label_,
               content_value_field_);
   AddLabelRow(three_column_layout_id, layout, domain_label_,
               domain_value_field_);
   AddLabelRow(three_column_layout_id, layout, path_label_, path_value_field_);
   AddLabelRow(three_column_layout_id, layout, send_for_label_,
               send_for_value_field_);
   AddLabelRow(three_column_layout_id, layout, created_label_,
               created_value_field_);
   AddLabelRow(three_column_layout_id, layout, expires_label_,
               expires_value_field_);
 }