Put the new harmonized dialog implementation behind flag.

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 "base/bind.h"
 #include "base/macros.h"
@@ skipping 14 matching lines @@
 #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/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
@@ skipping 888 matching lines @@
       ParseEAPUIProperty(&passphrase_ui_data_, network, ::onc::eap::kPassword);
     else
       ParseUIProperty(&passphrase_ui_data_, network, ::onc::wifi::kPassphrase);
   }
 
   views::GridLayout* layout = layout_utils::CreatePanelLayout(this);
   LayoutDelegate* delegate = LayoutDelegate::Get();
 
   const int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
-  const int kLabelMinWidth = 150;
   const int kPasswordVisibleWidth = 20;
   // Label
-  column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL, 1,
-                        views::GridLayout::USE_PREF, 0, kLabelMinWidth);
+  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;

[xdai1, 2017/02/15 01:46:09]

This value increased a little bit because we removed the padding to the right of
the "eye" button.

+    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));
   // 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));
   // Password visible button / policy indicator.
   column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL, 0,
                         views::GridLayout::FIXED, kPasswordVisibleWidth, 0);
-  column_set->AddPaddingColumn(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
 
   // 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));
-      layout->AddView(ssid_textfield_, 1, 1, views::GridLayout::FILL,
-                      views::GridLayout::FILL, 0,
-                      ChildNetworkConfigView::kInputFieldHeight);
+      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));
   }
 
   // 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);
-    layout->AddView(security_combobox_, 1, 1, views::GridLayout::FILL,
-                    views::GridLayout::FILL, 0,
-                    ChildNetworkConfigView::kInputFieldHeight);
+    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));
   }
 
   // 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());
-    layout->AddView(eap_method_combobox_, 1, 1, views::GridLayout::FILL,
-                    views::GridLayout::FILL, 0,
-                    ChildNetworkConfigView::kInputFieldHeight);
+    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));
 
     // 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);
-    layout->AddView(phase_2_auth_combobox_, 1, 1, views::GridLayout::FILL,
-                    views::GridLayout::FILL, 0,
-                    ChildNetworkConfigView::kInputFieldHeight);
+    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));
 
     // 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);
-    layout->AddView(server_ca_cert_combobox_, 1, 1, views::GridLayout::FILL,
-                    views::GridLayout::FILL, 0,
-                    ChildNetworkConfigView::kInputFieldHeight);
+    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));
 
     // 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);
-    layout->AddView(subject_match_textfield_, 1, 1, views::GridLayout::FILL,
-                    views::GridLayout::FILL, 0,
-                    ChildNetworkConfigView::kInputFieldHeight);
+    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));
 
     // 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);
-    layout->AddView(user_cert_combobox_, 1, 1, views::GridLayout::FILL,
-                    views::GridLayout::FILL, 0,
-                    ChildNetworkConfigView::kInputFieldHeight);
+    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));
 
     // 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());
-    layout->AddView(identity_textfield_, 1, 1, views::GridLayout::FILL,
-                    views::GridLayout::FILL, 0,
-                    ChildNetworkConfigView::kInputFieldHeight);
+    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));
   }
 
   // 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();
   passphrase_textfield_->set_controller(this);
   // Disable passphrase input initially for other network.
   passphrase_label_->SetEnabled(network);
   passphrase_textfield_->SetEnabled(network &&
                                     passphrase_ui_data_.IsEditable());
   passphrase_textfield_->SetAccessibleName(passphrase_label_text);
-  layout->AddView(passphrase_textfield_, 1, 1, views::GridLayout::FILL,
-                  views::GridLayout::FILL, 0,
-                  ChildNetworkConfigView::kInputFieldHeight);
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    layout->AddView(passphrase_textfield_, 1, 1, views::GridLayout::FILL,
+                    views::GridLayout::FILL, 0,
+                    ChildNetworkConfigView::kInputFieldHeight);
+  } else {
+    layout->AddView(passphrase_textfield_);
+  }
 
   if (passphrase_ui_data_.IsManaged()) {
     layout->AddView(new ControlledSettingIndicatorView(passphrase_ui_data_));
   } else {
     // Password visible button.
     passphrase_visible_button_ = new views::ToggleImageButton(this);
     passphrase_visible_button_->SetFocusForPlatform();
     passphrase_visible_button_->set_request_focus_on_press(true);
     passphrase_visible_button_->SetTooltipText(
         l10n_util::GetStringUTF16(
@@ skipping 30 matching lines @@
     // 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);
-    layout->AddView(identity_anonymous_textfield_, 1, 1,
-                    views::GridLayout::FILL, views::GridLayout::FILL, 0,
-                    ChildNetworkConfigView::kInputFieldHeight);
+    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));
   }
 
-  // We need a little bit more padding before Checkboxes.
-  layout->AddPaddingRow(
-      0, delegate->GetMetric(
-             LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    // We need a little bit more padding above Checkboxes.
+    layout->AddPaddingRow(
+        0, delegate->GetMetric(
+               LayoutDelegate::Metric::RELATED_CONTROL_VERTICAL_SPACING));
+  }
 
   // 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(
@@ skipping 217 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