Rename various LayoutDelegate types/functions for brevity and consistency.

chrome/browser/ui/views/content_setting_bubble_contents.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/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 168 matching lines @@
 
 ContentSettingBubbleContents::~ContentSettingBubbleContents() {
   // Must remove the children here so the comboboxes get destroyed before
   // their associated models.
   RemoveAllChildViews(true);
 }
 
 gfx::Size ContentSettingBubbleContents::GetPreferredSize() const {
   gfx::Size preferred_size(views::View::GetPreferredSize());
   int preferred_width = LayoutDelegate::Get()->GetDialogPreferredWidth(
-      LayoutDelegate::DialogWidthType::SMALL);
+      LayoutDelegate::DialogWidth::SMALL);
   if (!preferred_width)
     preferred_width = (!content_setting_bubble_model_->bubble_content()
                             .domain_lists.empty() &&
                        (kMinMultiLineContentsWidth > preferred_size.width()))
                           ? kMinMultiLineContentsWidth
                           : preferred_size.width();
   else
     preferred_width -= margins().width();
   if (content_setting_bubble_model_->AsSubresourceFilterBubbleModel()) {
     preferred_size.set_width(std::min(preferred_width,
                                       kMaxDefaultContentsWidth));
   } else {
     preferred_size.set_width(std::min(preferred_width, kMaxContentsWidth));
   }
   return preferred_size;
 }
 
 void ContentSettingBubbleContents::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   const LayoutDelegate* layout_delegate = LayoutDelegate::Get();
-  const int related_control_horizontal_spacing =
-      layout_delegate->GetLayoutDistance(
-          LayoutDelegate::LayoutDistanceType::
-              RELATED_CONTROL_HORIZONTAL_SPACING);
-  const int related_control_vertical_spacing =
-      layout_delegate->GetLayoutDistance(
-          LayoutDelegate::LayoutDistanceType::RELATED_CONTROL_VERTICAL_SPACING);
-  const int unrelated_control_vertical_spacing =
-      layout_delegate->GetLayoutDistance(
-          LayoutDelegate::LayoutDistanceType::
-              UNRELATED_CONTROL_VERTICAL_SPACING);
+  const int related_control_horizontal_spacing = layout_delegate->GetMetric(
+      LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING);
+  const int related_control_vertical_spacing = layout_delegate->GetMetric(
+      LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING);
+  const int unrelated_control_vertical_spacing = layout_delegate->GetMetric(
+      LayoutDelegate::Metric::UNRELATED_CONTROL_VERTICAL_SPACING);
 
   const int kSingleColumnSetId = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(kSingleColumnSetId);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, related_control_horizontal_spacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
@@ skipping 67 matching lines @@
       row++;
       bubble_content_empty = false;
     }
   }
 
   const int indented_kSingleColumnSetId = 3;
   // Insert a column set with greater indent.
   views::ColumnSet* indented_single_column_set =
       layout->AddColumnSet(indented_kSingleColumnSetId);
   indented_single_column_set->AddPaddingColumn(
-      0, layout_delegate->GetLayoutDistance(
-             LayoutDelegate::LayoutDistanceType::SUBSECTION_HORIZONTAL_INDENT));
+      0,
+      layout_delegate->GetMetric(
+          LayoutDelegate::Metric::SUBSECTION_HORIZONTAL_INDENT));
   indented_single_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
                                         1, GridLayout::USE_PREF, 0, 0);
 
   const ContentSettingBubbleModel::RadioGroup& radio_group =
       bubble_content.radio_group;
   if (!radio_group.radio_items.empty()) {
     if (!bubble_content_empty)
       layout->AddPaddingRow(0, related_control_vertical_spacing);
     for (ContentSettingBubbleModel::RadioItems::const_iterator i(
          radio_group.radio_items.begin());
@@ skipping 21 matching lines @@
     radio_group_[radio_group.default_item]->SetChecked(true);
   }
 
   // Layout code for the media device menus.
   if (content_setting_bubble_model_->AsMediaStreamBubbleModel()) {
     const int kMediaMenuColumnSetId = 4;
     views::ColumnSet* menu_column_set =
         layout->AddColumnSet(kMediaMenuColumnSetId);
     menu_column_set->AddPaddingColumn(
         0,
-        layout_delegate->GetLayoutDistance(
-             LayoutDelegate::LayoutDistanceType::SUBSECTION_HORIZONTAL_INDENT));
+        layout_delegate->GetMetric(
+            LayoutDelegate::Metric::SUBSECTION_HORIZONTAL_INDENT));
     menu_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
                                GridLayout::USE_PREF, 0, 0);
     menu_column_set->AddPaddingColumn(0, related_control_horizontal_spacing);
     menu_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                                GridLayout::USE_PREF, 0, 0);
 
     for (ContentSettingBubbleModel::MediaMenuMap::const_iterator i(
          bubble_content.media_menus.begin());
          i != bubble_content.media_menus.end(); ++i) {
       if (!bubble_content_empty)
@@ skipping 145 matching lines @@
   DCHECK(i != list_item_links_.end());
   content_setting_bubble_model_->OnListItemClicked(i->second);
 }
 
 void ContentSettingBubbleContents::OnPerformAction(views::Combobox* combobox) {
   MediaComboboxModel* model =
       static_cast<MediaComboboxModel*>(combobox->model());
   content_setting_bubble_model_->OnMediaMenuClicked(
       model->type(), model->GetDevices()[combobox->selected_index()].id);
 }