Broke out layout metric information from ViewsDelegate to LayoutProvider

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"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h"
 #include "chrome/browser/ui/browser_dialogs.h"
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_views_layout_delegate.h"
 #include "chrome/browser/ui/views/layout_utils.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/url_fixer.h"
 #include "components/user_prefs/user_prefs.h"
@@ skipping 306 matching lines @@
     tree_view_->set_context_menu_controller(this);
 
     new_folder_button_.reset(views::MdTextButton::CreateSecondaryUiButton(
         this,
         l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON)));
     new_folder_button_->set_owned_by_client();
     new_folder_button_->SetEnabled(false);
   }
 
   GridLayout* layout = layout_utils::CreatePanelLayout(this);
-  LayoutDelegate* delegate = LayoutDelegate::Get();
+  ChromeViewsLayoutDelegate* delegate = ChromeViewsLayoutDelegate::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->GetMetric(
-          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
+      0, delegate->GetDistanceMetric(
+             ChromeDistanceMetric::RELATED_CONTROL_HORIZONTAL));
   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->GetMetric(
-          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
+      1, delegate->GetDistanceMetric(
+             ChromeDistanceMetric::RELATED_CONTROL_HORIZONTAL));
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(
-      0,
-      delegate->GetMetric(
-          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
+      0, delegate->GetDistanceMetric(
+             ChromeDistanceMetric::RELATED_CONTROL_HORIZONTAL));
   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->GetMetric(
-            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0,
+                          delegate->GetDistanceMetric(
+                              ChromeDistanceMetric::RELATED_CONTROL_VERTICAL));
 
     layout->StartRow(0, labels_column_set_id);
     layout->AddView(url_label_);
     layout->AddView(url_tf_);
   }
 
   if (show_tree_) {
-    layout->AddPaddingRow(
-        0,
-        delegate->GetMetric(
-            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0,
+                          delegate->GetDistanceMetric(
+                              ChromeDistanceMetric::RELATED_CONTROL_VERTICAL));
     layout->StartRow(1, single_column_view_set_id);
     layout->AddView(tree_view_->CreateParentIfNecessary());
   }
 
   if (delegate->UseExtraDialogPadding()) {
-    layout->AddPaddingRow(
-        0,
-        delegate->GetMetric(
-            LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0,
+                          delegate->GetDistanceMetric(
+                              ChromeDistanceMetric::RELATED_CONTROL_VERTICAL));
   }
 
   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