Don't require login to enable CA cert settings

chrome/browser/chromeos/options/wifi_config_view.cc

 // Copyright (c) 2011 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 "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
@@ skipping 169 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ComboboxWithWidth);
 };
 
 class ServerCACertComboboxModel : public ui::ComboboxModel {
  public:
   explicit ServerCACertComboboxModel(CertLibrary* cert_library)
       : cert_library_(cert_library) {
     DCHECK(cert_library);
   }
   virtual ~ServerCACertComboboxModel() {}
   virtual int GetItemCount() {

[zel, 2011/12/02 00:07:23]

if (!UserManager::Get()->user_is_logged_in())
  return what-ever-is-"Do not check";

-    if (!cert_library_->CertificatesLoaded())
-      return 1;  // "Loading"
-    // First "Default", then the certs, then "Do not check".
+    // First "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);
     if (combo_index == GetItemCount() - 1)
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DO_NOT_CHECK);
     int cert_index = combo_index - 1;
     return cert_library_->GetCACertificates().GetDisplayStringAt(cert_index);
   }
 
  private:
   CertLibrary* cert_library_;
   DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
 };
 
 class UserCertComboboxModel : public ui::ComboboxModel {
  public:
   explicit UserCertComboboxModel(CertLibrary* cert_library)
       : cert_library_(cert_library) {
     DCHECK(cert_library);
   }
   virtual ~UserCertComboboxModel() {}
   virtual int GetItemCount() {

[zel, 2011/12/02 00:07:23]

if (!UserManager::Get()->user_is_logged_in())
  return what-ever-is-"Do not check";

[stevenjb, 2011/12/02 01:26:33]

This should now return "None installed" when not logged in (CertificatesLoaded()
will return true, but num_certs == 0)

     if (!cert_library_->CertificatesLoaded())
       return 1;  // "Loading"
     int num_certs = cert_library_->GetUserCertificates().Size();
     if (num_certs == 0)
       return 1;  // "None installed"
     return num_certs;
   }
   virtual string16 GetItemAt(int combo_index) {
     if (!cert_library_->CertificatesLoaded())
       return l10n_util::GetStringUTF16(
@@ skipping 149 matching lines @@
                                     passphrase_ui_data_.editable());
   passphrase_label_->SetEnabled(passphrase_textfield_->IsEnabled());
   if (!passphrase_textfield_->IsEnabled())
     passphrase_textfield_->SetText(string16());
 
   // User certs only for EAP-TLS
   bool certs_loading = !cert_library_->CertificatesLoaded();
   bool user_cert_enabled = (selected == EAP_METHOD_INDEX_TLS);
   user_cert_label_->SetEnabled(user_cert_enabled);
   bool have_user_certs = !certs_loading && HaveUserCerts();
   user_cert_combobox_->SetEnabled(user_cert_enabled &&

[zel, 2011/12/02 00:07:23]

disable this if user is not logged in by adding condition:

  UserManager::Get()->user_is_logged_in() &&

[stevenjb, 2011/12/02 01:26:33]

HaveUserCerts() will now return false, so this will be disabled.

                                   have_user_certs &&
                                   user_cert_ui_data_.editable());
   user_cert_combobox_->ModelChanged();
   user_cert_combobox_->SetSelectedItem(0);
 
   // No server CA certs for LEAP
   bool ca_cert_enabled =
       (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 &&

[zel, 2011/12/02 00:07:23]

disable this if user is not logged in by adding condition:

  UserManager::Get()->user_is_logged_in() &&

[stevenjb, 2011/12/02 01:26:33]

We should probably leave this enabled in case users need to differentiate
between "Use Default" and "Do Not Check". That is definitely the easiest / most
straight forward thing to do.

-                                       !certs_loading &&
                                        server_ca_cert_ui_data_.editable());
   server_ca_cert_combobox_->ModelChanged();
   server_ca_cert_combobox_->SetSelectedItem(0);
 
   // No anonymous identity if no phase 2 auth.
   identity_anonymous_textfield_->SetEnabled(
       phase_2_auth_combobox_->IsEnabled() &&
       identity_anonymous_ui_data_.editable());
   identity_anonymous_label_->SetEnabled(
       identity_anonymous_textfield_->IsEnabled());
@@ skipping 715 matching lines @@
   // Set focus to a reasonable widget, depending on what we're showing.
   if (ssid_textfield_)
     ssid_textfield_->RequestFocus();
   else if (eap_method_combobox_)
     eap_method_combobox_->RequestFocus();
   else if (passphrase_textfield_ && passphrase_textfield_->IsEnabled())
     passphrase_textfield_->RequestFocus();
 }
 
 }  // namespace chromeos