| Index: chrome/browser/chromeos/options/vpn_config_view.cc
|
| diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
|
| index b131821f4212fa08d5c6231fbf4a3dfafd8b06e6..9ade022bcea10fb78b03e8e6f7e3c4ab0455bc5d 100644
|
| --- a/chrome/browser/chromeos/options/vpn_config_view.cc
|
| +++ b/chrome/browser/chromeos/options/vpn_config_view.cc
|
| @@ -323,7 +323,7 @@ const std::string VPNConfigView::GetServer() const {
|
|
|
| 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();
|
| @@ -619,7 +619,7 @@ void VPNConfigView::Refresh() {
|
| 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(
|
| @@ -637,7 +637,7 @@ void VPNConfigView::Refresh() {
|
|
|
| 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());
|
| @@ -761,7 +761,7 @@ bool VPNConfigView::HaveUserCerts() const {
|
| }
|
|
|
| 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)
|
|
|