Don't require login to enable CA cert settings

chrome/browser/chromeos/cros/cert_library.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/cros/cert_library.h"
 
 #include <algorithm>
 
 #include "base/observer_list_threadsafe.h"
 #include "base/utf_string_conversions.h"
@@ skipping 59 matching lines @@
 // are already terminated.
 class CertLibraryImpl
     : public CertLibrary,
       public net::CertDatabase::Observer {
  public:
   typedef ObserverListThreadSafe<CertLibrary::Observer> CertLibraryObserverList;
 
   CertLibraryImpl() :
       observer_list_(new CertLibraryObserverList),
       user_logged_in_(false),
+      certificates_requested_(false),
       certificates_loaded_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(certs_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(user_certs_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(server_certs_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(server_ca_certs_(this)) {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     net::CertDatabase::AddObserver(this);
   }
 
   ~CertLibraryImpl() {
     DCHECK(request_task_.is_null());
     net::CertDatabase::RemoveObserver(this);
   }
 
   // CertLibrary implementation.
   virtual void RequestCertificates() OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+    certificates_requested_ = true;
+
     if (!UserManager::Get()->user_is_logged_in()) {
       // If we are not logged in, we cannot load any certificates.
       // Set 'loaded' to true for the UI, since we are not waiting on loading.
       LOG(WARNING) << "Requesting certificates before login.";
       certificates_loaded_ = true;
       return;
     }
 
     if (!user_logged_in_) {
       user_logged_in_ = true;
@@ skipping 36 matching lines @@
   }
 
   virtual void AddObserver(CertLibrary::Observer* observer) OVERRIDE {
     observer_list_->AddObserver(observer);
   }
 
   virtual void RemoveObserver(CertLibrary::Observer* observer) OVERRIDE {
     observer_list_->RemoveObserver(observer);
   }
 
+  virtual bool CertificatesLoading() const OVERRIDE {
+    return certificates_requested_ && !certificates_loaded_;
+  }
+
   virtual bool CertificatesLoaded() const OVERRIDE {
     return certificates_loaded_;
   }
 
   virtual bool IsHardwareBacked() const OVERRIDE {
     return !tpm_token_name_.empty();
   }
 
   virtual const CertList& GetCertificates() const OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 159 matching lines @@
   const scoped_refptr<CertLibraryObserverList> observer_list_;
 
   // Active request task for re-requests while waiting for TPM init.
   base::Closure request_task_;
 
   // Cached TPM token name.
   std::string tpm_token_name_;
 
   // Local state.
   bool user_logged_in_;
+  bool certificates_requested_;
   bool certificates_loaded_;
 
   // Certificates.
   CertList certs_;
   CertList user_certs_;
   CertList server_certs_;
   CertList server_ca_certs_;
 
   DISALLOW_COPY_AND_ASSIGN(CertLibraryImpl);
 };
@@ skipping 60 matching lines @@
     net::X509Certificate* cert = GetCertificateAt(index);
     net::X509Certificate::OSCertHandle cert_handle = cert->os_cert_handle();
     std::string id = x509_certificate_model::GetPkcs11Id(cert_handle);
     if (id == pkcs11_id)
       return index;
   }
   return -1;  // Not found.
 }
 
 }  // chromeos