Fix WiFi & VPN connection dialogs when controls a disabled through policy.

chrome/browser/chromeos/options/vpn_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/vpn_config_view.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 305 matching lines @@
 }
 
 const std::string VPNConfigView::GetServer() const {
   if (server_textfield_ != NULL)
     return GetTextFromField(server_textfield_, true);
   return server_hostname_;
 }
 
 const std::string VPNConfigView::GetPSKPassphrase() const {
   if (psk_passphrase_textfield_ &&
-      psk_passphrase_textfield_->enabled() &&
+      enable_psk_passphrase_ &&
       psk_passphrase_textfield_->visible())
     return GetTextFromField(psk_passphrase_textfield_, false);
   return std::string();
 }
 
 const std::string VPNConfigView::GetUsername() const {
   return GetTextFromField(username_textfield_, true);
 }
 
 const std::string VPNConfigView::GetUserPassphrase() const {
@@ skipping 275 matching lines @@
 
 void VPNConfigView::Refresh() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
 
   UpdateControls();
 
   // Set certificate combo boxes.
   VirtualNetwork* vpn = cros->FindVirtualNetworkByPath(service_path_);
   if (server_ca_cert_combobox_) {
     server_ca_cert_combobox_->ModelChanged();
-    if (server_ca_cert_combobox_->enabled() &&
+    if (enable_server_ca_cert_ &&
         (vpn && !vpn->ca_cert_nss().empty())) {
       // Select the current server CA certificate in the combobox.
       int cert_index = cert_library_->GetCACertificates().FindCertByNickname(
           vpn->ca_cert_nss());
       if (cert_index >= 0) {
         // Skip item for "Default"
         server_ca_cert_combobox_->SetSelectedItem(1 + cert_index);
       } else {
         server_ca_cert_combobox_->SetSelectedItem(0);
       }
     } else {
       server_ca_cert_combobox_->SetSelectedItem(0);
     }
   }
 
   if (user_cert_combobox_) {
     user_cert_combobox_->ModelChanged();
-    if (user_cert_combobox_->enabled() &&
+    if (enable_user_cert_ &&
         (vpn && !vpn->client_cert_id().empty())) {
       int cert_index = cert_library_->GetUserCertificates().FindCertByPkcs11Id(
           vpn->client_cert_id());
       if (cert_index >= 0)
         user_cert_combobox_->SetSelectedItem(cert_index);
       else
         user_cert_combobox_->SetSelectedItem(0);
     } else {
       user_cert_combobox_->SetSelectedItem(0);
     }
@@ skipping 103 matching lines @@
 
 bool VPNConfigView::UserCertRequired() const {
   return provider_type_ == PROVIDER_TYPE_L2TP_IPSEC_USER_CERT;
 }
 
 bool VPNConfigView::HaveUserCerts() const {
   return cert_library_->GetUserCertificates().Size() > 0;
 }
 
 bool VPNConfigView::IsUserCertValid() const {
-  if (!user_cert_combobox_ || !user_cert_combobox_->enabled())
+  if (!user_cert_combobox_ || !enable_user_cert_)
     return false;
   int selected = user_cert_combobox_->selected_item();
   if (selected < 0)
     return false;
   // Currently only hardware-backed user certificates are valid.
   if (cert_library_->IsHardwareBacked() &&
       !cert_library_->GetUserCertificates().IsHardwareBackedAt(selected))
     return false;
   return true;
 }
@@ skipping 24 matching lines @@
   std::string vpn_type;
   if (!vpn_dict || !vpn_dict->GetString(onc::kType, &vpn_type))
     return;
 
   property_ui_data->ParseOncProperty(
       network->ui_data(), onc,
       base::StringPrintf("%s.%s.%s", onc::kVPN, vpn_type.c_str(), key.c_str()));
 }
 
 }  // namespace chromeos