| Index: chrome/browser/chromeos/options/wifi_config_view.cc
|
| diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
|
| index a56486332cef16c17a779370fc2a46d3e642016f..e0f28ae3b630bb0696de9123e5ae8c67ac61f67b 100644
|
| --- a/chrome/browser/chromeos/options/wifi_config_view.cc
|
| +++ b/chrome/browser/chromeos/options/wifi_config_view.cc
|
| @@ -188,15 +188,10 @@ class ServerCACertComboboxModel : public ui::ComboboxModel {
|
| }
|
| virtual ~ServerCACertComboboxModel() {}
|
| virtual int GetItemCount() {
|
| - if (!cert_library_->CertificatesLoaded())
|
| - return 1; // "Loading"
|
| - // First "Default", then the certs, then "Do not check".
|
| + // First "Use Default", then the certs (if any), then "Do not check".
|
| return cert_library_->GetCACertificates().Size() + 2;
|
| }
|
| virtual string16 GetItemAt(int combo_index) {
|
| - if (!cert_library_->CertificatesLoaded())
|
| - return l10n_util::GetStringUTF16(
|
| - IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
|
| if (combo_index == 0)
|
| return l10n_util::GetStringUTF16(
|
| IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
|
| @@ -400,7 +395,6 @@ void WifiConfigView::RefreshEapFields() {
|
| (selected != EAP_METHOD_INDEX_NONE && selected != EAP_METHOD_INDEX_LEAP);
|
| server_ca_cert_label_->SetEnabled(ca_cert_enabled);
|
| server_ca_cert_combobox_->SetEnabled(ca_cert_enabled &&
|
| - !certs_loading &&
|
| server_ca_cert_ui_data_.editable());
|
| server_ca_cert_combobox_->ModelChanged();
|
| server_ca_cert_combobox_->SetSelectedItem(0);
|
|
|