Chromium Code Reviews| 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..7654700585ba447f5f705f9a2efcf15d0b87474c 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/ref_counted.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,9 +34,17 @@ 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|. |
| + // Static so it may safelly be used on the worker thread. |
| + static void ListCertsImpl( |
| + const scoped_refptr<NSSProfileFilterChromeOS> profile_filter, |
|
Ryan Sleevi
2014/01/29 02:24:20
style: Don't pass by value - "const scoped_refptr<
tbarzic
2014/01/29 20:50:52
The reason this is part of the class is to be able
|
| + CertificateList* certs); |
| + |
| crypto::ScopedPK11Slot public_slot_; |
| crypto::ScopedPK11Slot private_slot_; |
| - NSSProfileFilterChromeOS profile_filter_; |
| + scoped_refptr<NSSProfileFilterChromeOS> profile_filter_; |
| DISALLOW_COPY_AND_ASSIGN(NSSCertDatabaseChromeOS); |
| }; |