Index: net/cert/nss_cert_database_chromeos.h |
diff --git a/net/cert/nss_cert_database_chromeos.h b/net/cert/nss_cert_database_chromeos.h |
index 63eab07542339582a998b2569c1109a6bcc8c70a..d0946882251b015d26d3c8e46750aeb061b20703 100644 |
--- a/net/cert/nss_cert_database_chromeos.h |
+++ b/net/cert/nss_cert_database_chromeos.h |
@@ -6,7 +6,9 @@ |
#define NET_CERT_NSS_CERT_DATABASE_CHROMEOS_ |
#include "base/callback.h" |
+#include "base/memory/weak_ptr.h" |
#include "crypto/scoped_nss_types.h" |
+#include "net/base/net_export.h" |
#include "net/cert/nss_cert_database.h" |
#include "net/cert/nss_profile_filter_chromeos.h" |
@@ -19,7 +21,9 @@ class NET_EXPORT NSSCertDatabaseChromeOS : public NSSCertDatabase { |
virtual ~NSSCertDatabaseChromeOS(); |
// NSSCertDatabase implementation. |
- virtual void ListCerts(CertificateList* certs) OVERRIDE; |
+ virtual void ListCertsSync(CertificateList* certs) OVERRIDE; |
+ virtual void ListCerts(const NSSCertDatabase::ListCertsCallback& callback) |
+ OVERRIDE; |
virtual crypto::ScopedPK11Slot GetPublicSlot() const OVERRIDE; |
virtual crypto::ScopedPK11Slot GetPrivateSlot() const OVERRIDE; |
virtual void ListModules(CryptoModuleList* modules, bool need_rw) const |
@@ -30,6 +34,13 @@ class NET_EXPORT NSSCertDatabaseChromeOS : public NSSCertDatabase { |
// TODO(mattm): handle trust setting correctly for certs in read-only slots. |
private: |
+ // Certificate listing implementation used by |ListCerts| and |ListCertsSync|. |
+ // The certificate list normally returned by NSSCertDatabase::ListCertsImpl |
+ // is additionally filterred by |profile_filter|. |
mattm
2014/01/30 04:34:37
filtered
tbarzic
2014/02/03 23:42:05
Done.
|
+ // Static so it may safelly be used on the worker thread. |
mattm
2014/01/30 04:34:37
safely
tbarzic
2014/02/03 23:42:05
Done.
|
+ static void ListCertsImpl(scoped_ptr<NSSProfileFilterChromeOS> profile_filter, |
Ryan Sleevi
2014/01/30 04:16:30
Just pass as const NSSProfileFilterChromeOS&
base
tbarzic
2014/02/03 23:42:05
Done.
|
+ CertificateList* certs); |
+ |
crypto::ScopedPK11Slot public_slot_; |
crypto::ScopedPK11Slot private_slot_; |
NSSProfileFilterChromeOS profile_filter_; |