Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/chromeos/options/wimax_config_view.cc

Index: chrome/browser/chromeos/options/wimax_config_view.cc
diff --git a/chrome/browser/chromeos/options/wimax_config_view.cc b/chrome/browser/chromeos/options/wimax_config_view.cc
index b92f35f0a31184edd3ef120dff6445bcd3fea7f7..f5e3f3ee209457f532b4eab5b044d9cc2bc1cca9 100644
--- a/chrome/browser/chromeos/options/wimax_config_view.cc
+++ b/chrome/browser/chromeos/options/wimax_config_view.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/net/shill_error.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "chromeos/login/login_state.h"
@@ -33,6 +32,7 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
+#include "ui/views/layout/layout_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
@@ -210,7 +210,7 @@ void WimaxConfigView::Init() {
       &passphrase_ui_data_, wimax, ::onc::wifi::kPassphrase);
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
-  LayoutDelegate* delegate = LayoutDelegate::Get();
+  views::LayoutDelegate* delegate = views::LayoutDelegate::Get();
 
   const int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
@@ -219,15 +219,15 @@ void WimaxConfigView::Init() {
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
+      0, delegate->GetDistanceMetric(
+             views::DistanceMetric::RELATED_CONTROL_HORIZONTAL));
   // Textfield, combobox.
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0,
                         ChildNetworkConfigView::kInputFieldMinWidth);
   column_set->AddPaddingColumn(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
+      0, delegate->GetDistanceMetric(
+             views::DistanceMetric::RELATED_CONTROL_HORIZONTAL));
   // Password visible button / policy indicator.
   column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, kPasswordVisibleWidth);
@@ -239,9 +239,9 @@ void WimaxConfigView::Init() {
   views::Label* label = new views::Label(base::UTF8ToUTF16(wimax->name()));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(label);
-  layout->AddPaddingRow(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+  layout->AddPaddingRow(0,
+                        delegate->GetDistanceMetric(
+                            views::DistanceMetric::RELATED_CONTROL_VERTICAL));
 
   // Identity
   layout->StartRow(0, column_view_set_id);
@@ -255,9 +255,9 @@ void WimaxConfigView::Init() {
   identity_textfield_->SetEnabled(identity_ui_data_.IsEditable());
   layout->AddView(identity_textfield_);
   layout->AddView(new ControlledSettingIndicatorView(identity_ui_data_));
-  layout->AddPaddingRow(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+  layout->AddPaddingRow(0,
+                        delegate->GetDistanceMetric(
+                            views::DistanceMetric::RELATED_CONTROL_VERTICAL));
 
   // Passphrase input
   layout->StartRow(0, column_view_set_id);
@@ -307,9 +307,9 @@ void WimaxConfigView::Init() {
     layout->AddView(passphrase_visible_button_);
   }
 
-  layout->AddPaddingRow(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+  layout->AddPaddingRow(0,
+                        delegate->GetDistanceMetric(
+                            views::DistanceMetric::RELATED_CONTROL_VERTICAL));
 
   // Checkboxes.
 
@@ -346,9 +346,9 @@ void WimaxConfigView::Init() {
     layout->SkipColumns(1);
     layout->AddView(share_network_checkbox_);
   }
-  layout->AddPaddingRow(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+  layout->AddPaddingRow(0,
+                        delegate->GetDistanceMetric(
+                            views::DistanceMetric::RELATED_CONTROL_VERTICAL));
 
   // Create an error label.
   layout->StartRow(0, column_view_set_id);