Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/chromeos/options/wifi_config_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/chromeos/options/wifi_config_view.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/net/shill_error.h"
 #include "chrome/browser/chromeos/options/passphrase_textfield.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"
 #include "chromeos/network/client_cert_util.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #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_provider.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 namespace chromeos {
 
 namespace {
 
 // Combobox that supports a preferred width.  Used by Server CA combobox
 // because the strings inside it are too wide.
 class ComboboxWithWidth : public views::Combobox {
@@ skipping 876 matching lines @@
         &identity_anonymous_ui_data_, network, ::onc::eap::kAnonymousIdentity);
     ParseEAPUIProperty(
         &save_credentials_ui_data_, network, ::onc::eap::kSaveCredentials);
     if (show_8021x)
       ParseEAPUIProperty(&passphrase_ui_data_, network, ::onc::eap::kPassword);
     else
       ParseUIProperty(&passphrase_ui_data_, network, ::onc::wifi::kPassphrase);
   }
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
-  LayoutDelegate* delegate = LayoutDelegate::Get();
+  views::LayoutProvider* provider = views::LayoutProvider::Get();
 
   const int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
   const int kPasswordVisibleWidth = 20;
   // Label
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     // This constant ensures the minimum width of the label column and ensures
     // the width of the Wifi dialog equals 512.
     const int kLabelMinWidth = 158;
     column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL,
                           1, views::GridLayout::USE_PREF, 0, kLabelMinWidth);
   } else {
     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,
+      provider->GetDistanceMetric(views::DISTANCE_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,
+      provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_HORIZONTAL));
   // Password visible button / policy indicator.
   column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL, 0,
                         views::GridLayout::FIXED, kPasswordVisibleWidth, 0);
 
   // SSID input
   if (!network || network->type() != shill::kTypeEthernet) {
     layout->StartRow(0, column_view_set_id);
     layout->AddView(new views::Label(l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID)));
     if (!network) {
       ssid_textfield_ = new views::Textfield();
       ssid_textfield_->set_controller(this);
       ssid_textfield_->SetAccessibleName(l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID));
       if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
         layout->AddView(ssid_textfield_, 1, 1, views::GridLayout::FILL,
                         views::GridLayout::FILL, 0,
                         ChildNetworkConfigView::kInputFieldHeight);
       } else {
         layout->AddView(ssid_textfield_);
       }
     } else {
       views::Label* label =
           new views::Label(base::UTF8ToUTF16(network->name()));
       label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       layout->AddView(label);
     }
-    layout->AddPaddingRow(
-        0, delegate->GetMetric(
-               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
   }
 
   // Security select
   if (!network && !show_8021x) {
     layout->StartRow(0, column_view_set_id);
     base::string16 label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY);
     layout->AddView(new views::Label(label_text));
     security_combobox_model_.reset(new internal::SecurityComboboxModel);
     security_combobox_ = new views::Combobox(security_combobox_model_.get());
     security_combobox_->SetAccessibleName(label_text);
     security_combobox_->set_listener(this);
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       layout->AddView(security_combobox_, 1, 1, views::GridLayout::FILL,
                       views::GridLayout::FILL, 0,
                       ChildNetworkConfigView::kInputFieldHeight);
     } else {
       layout->AddView(security_combobox_);
     }
     layout->AddView(security_combobox_);
-    layout->AddPaddingRow(
-        0, delegate->GetMetric(
-               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
   }
 
   // Only enumerate certificates in the data model for 802.1X networks.
   if (show_8021x) {
     // Observer any changes to the certificate list.
     CertLibrary::Get()->AddObserver(this);
 
     // EAP method
     layout->StartRow(0, column_view_set_id);
     base::string16 eap_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD);
     layout->AddView(new views::Label(eap_label_text));
     eap_method_combobox_model_.reset(new internal::EAPMethodComboboxModel);
     eap_method_combobox_ = new views::Combobox(
         eap_method_combobox_model_.get());
     eap_method_combobox_->SetAccessibleName(eap_label_text);
     eap_method_combobox_->set_listener(this);
     eap_method_combobox_->SetEnabled(eap_method_ui_data_.IsEditable());
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       layout->AddView(eap_method_combobox_, 1, 1, views::GridLayout::FILL,
                       views::GridLayout::FILL, 0,
                       ChildNetworkConfigView::kInputFieldHeight);
     } else {
       layout->AddView(eap_method_combobox_);
     }
     layout->AddView(new ControlledSettingIndicatorView(eap_method_ui_data_));
-    layout->AddPaddingRow(
-        0, delegate->GetMetric(
-               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
 
     // Phase 2 authentication
     layout->StartRow(0, column_view_set_id);
     base::string16 phase_2_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH);
     phase_2_auth_label_ = new views::Label(phase_2_label_text);
     layout->AddView(phase_2_auth_label_);
     phase_2_auth_combobox_model_.reset(
         new internal::Phase2AuthComboboxModel(eap_method_combobox_));
     phase_2_auth_combobox_ = new views::Combobox(
         phase_2_auth_combobox_model_.get());
     phase_2_auth_combobox_->SetAccessibleName(phase_2_label_text);
     phase_2_auth_label_->SetEnabled(false);
     phase_2_auth_combobox_->SetEnabled(false);
     phase_2_auth_combobox_->set_listener(this);
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       layout->AddView(phase_2_auth_combobox_, 1, 1, views::GridLayout::FILL,
                       views::GridLayout::FILL, 0,
                       ChildNetworkConfigView::kInputFieldHeight);
     } else {
       layout->AddView(phase_2_auth_combobox_);
     }
     layout->AddView(new ControlledSettingIndicatorView(phase_2_auth_ui_data_));
-    layout->AddPaddingRow(
-        0, delegate->GetMetric(
-               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
 
     // Server CA certificate
     layout->StartRow(0, column_view_set_id);
     base::string16 server_ca_cert_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA);
     server_ca_cert_label_ = new views::Label(server_ca_cert_label_text);
     layout->AddView(server_ca_cert_label_);
     server_ca_cert_combobox_model_.reset(
         new internal::ServerCACertComboboxModel());
     server_ca_cert_combobox_ = new ComboboxWithWidth(
         server_ca_cert_combobox_model_.get(),
         ChildNetworkConfigView::kInputFieldMinWidth);
     server_ca_cert_combobox_->SetAccessibleName(server_ca_cert_label_text);
     server_ca_cert_label_->SetEnabled(false);
     server_ca_cert_combobox_->SetEnabled(false);
     server_ca_cert_combobox_->set_listener(this);
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       layout->AddView(server_ca_cert_combobox_, 1, 1, views::GridLayout::FILL,
                       views::GridLayout::FILL, 0,
                       ChildNetworkConfigView::kInputFieldHeight);
     } else {
       layout->AddView(server_ca_cert_combobox_);
     }
     layout->AddView(
         new ControlledSettingIndicatorView(server_ca_cert_ui_data_));
-    layout->AddPaddingRow(
-        0, delegate->GetMetric(
-               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
 
     // Subject Match
     layout->StartRow(0, column_view_set_id);
     base::string16 subject_match_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_SUBJECT_MATCH);
     subject_match_label_ = new views::Label(subject_match_label_text);
     layout->AddView(subject_match_label_);
     subject_match_textfield_ = new views::Textfield();
     subject_match_textfield_->SetAccessibleName(subject_match_label_text);
     subject_match_textfield_->set_controller(this);
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       layout->AddView(subject_match_textfield_, 1, 1, views::GridLayout::FILL,
                       views::GridLayout::FILL, 0,
                       ChildNetworkConfigView::kInputFieldHeight);
     } else {
       layout->AddView(subject_match_textfield_);
     }
-    layout->AddPaddingRow(
-        0, delegate->GetMetric(
-               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
 
     // User certificate
     layout->StartRow(0, column_view_set_id);
     base::string16 user_cert_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT);
     user_cert_label_ = new views::Label(user_cert_label_text);
     layout->AddView(user_cert_label_);
     user_cert_combobox_model_.reset(new internal::UserCertComboboxModel(this));
     user_cert_combobox_ = new views::Combobox(user_cert_combobox_model_.get());
     user_cert_combobox_->SetAccessibleName(user_cert_label_text);
     user_cert_label_->SetEnabled(false);
     user_cert_combobox_->SetEnabled(false);
     user_cert_combobox_->set_listener(this);
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       layout->AddView(user_cert_combobox_, 1, 1, views::GridLayout::FILL,
                       views::GridLayout::FILL, 0,
                       ChildNetworkConfigView::kInputFieldHeight);
     } else {
       layout->AddView(user_cert_combobox_);
     }
     layout->AddView(new ControlledSettingIndicatorView(user_cert_ui_data_));
-    layout->AddPaddingRow(
-        0, delegate->GetMetric(
-               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
 
     // Identity
     layout->StartRow(0, column_view_set_id);
     base::string16 identity_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY);
     identity_label_ = new views::Label(identity_label_text);
     layout->AddView(identity_label_);
     identity_textfield_ = new views::Textfield();
     identity_textfield_->SetAccessibleName(identity_label_text);
     identity_textfield_->set_controller(this);
     identity_textfield_->SetEnabled(identity_ui_data_.IsEditable());
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       layout->AddView(identity_textfield_, 1, 1, views::GridLayout::FILL,
                       views::GridLayout::FILL, 0,
                       ChildNetworkConfigView::kInputFieldHeight);
     } else {
       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, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
   }
 
   // Passphrase input
   layout->StartRow(0, column_view_set_id);
   int label_text_id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE;
   base::string16 passphrase_label_text =
       l10n_util::GetStringUTF16(label_text_id);
   passphrase_label_ = new views::Label(passphrase_label_text);
   layout->AddView(passphrase_label_);
   passphrase_textfield_ = new PassphraseTextfield();
@@ skipping 39 matching lines @@
     passphrase_visible_button_->SetToggledImage(
         views::ImageButton::STATE_HOVERED,
         ResourceBundle::GetSharedInstance().
         GetImageSkiaNamed(IDR_NETWORK_HIDE_PASSWORD_HOVER));
     passphrase_visible_button_->SetImageAlignment(
         views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE);
     layout->AddView(passphrase_visible_button_);
   }
 
   layout->AddPaddingRow(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+      0, provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL));
 
   if (show_8021x) {
     // Anonymous identity
     layout->StartRow(0, column_view_set_id);
     identity_anonymous_label_ =
         new views::Label(l10n_util::GetStringUTF16(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY_ANONYMOUS));
     layout->AddView(identity_anonymous_label_);
     identity_anonymous_textfield_ = new views::Textfield();
     identity_anonymous_label_->SetEnabled(false);
     identity_anonymous_textfield_->SetEnabled(false);
     identity_anonymous_textfield_->set_controller(this);
     if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
       layout->AddView(identity_anonymous_textfield_, 1, 1,
                       views::GridLayout::FILL, views::GridLayout::FILL, 0,
                       ChildNetworkConfigView::kInputFieldHeight);
     } else {
       layout->AddView(identity_anonymous_textfield_);
     }
     layout->AddView(
         new ControlledSettingIndicatorView(identity_anonymous_ui_data_));
-    layout->AddPaddingRow(
-        0, delegate->GetMetric(
-               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
   }
 
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     // We need a little bit more padding above Checkboxes.
-    layout->AddPaddingRow(
-        0, delegate->GetMetric(
-               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+    layout->AddPaddingRow(0, provider->GetDistanceMetric(
+                                 views::DISTANCE_RELATED_CONTROL_VERTICAL));
   }
 
   // Checkboxes.
 
   // Save credentials
   if (show_8021x) {
     layout->StartRow(0, column_view_set_id);
     save_credentials_checkbox_ = new views::Checkbox(
         l10n_util::GetStringUTF16(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SAVE_CREDENTIALS));
     save_credentials_checkbox_->SetEnabled(
         save_credentials_ui_data_.IsEditable());
     layout->SkipColumns(1);
     layout->AddView(save_credentials_checkbox_);
     layout->AddView(
         new ControlledSettingIndicatorView(save_credentials_ui_data_));
   }
 
   // Share network
   if (!network || network->profile_path().empty()) {
     layout->StartRow(0, column_view_set_id);
     share_network_checkbox_ = new views::Checkbox(
         l10n_util::GetStringUTF16(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SHARE_NETWORK));
     layout->SkipColumns(1);
     layout->AddView(share_network_checkbox_);
   }
   layout->AddPaddingRow(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+      0, provider->GetDistanceMetric(views::DISTANCE_RELATED_CONTROL_VERTICAL));
 
   // Create an error label.
   layout->StartRow(0, column_view_set_id);
   layout->SkipColumns(1);
   error_label_ = new views::Label();
   error_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   error_label_->SetEnabledColor(SK_ColorRED);
   layout->AddView(error_label_);
 
   // Initialize the field and checkbox values.
@@ skipping 188 matching lines @@
 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
                                         const NetworkState* network,
                                         const std::string& key) {
   std::string onc_tag = network->type() == shill::kTypeEthernet
                             ? ::onc::ethernet::kEAP
                             : ::onc::wifi::kEAP;
   ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
 }
 
 }  // namespace chromeos