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 b68f742b5183f9e62798a015de1e76452d625302..1c94233b3352e12583b331c938812749f8690663 100644 | 
| --- a/net/cert/nss_cert_database_chromeos.h | 
| +++ b/net/cert/nss_cert_database_chromeos.h | 
| @@ -16,16 +16,25 @@ namespace net { | 
| class NET_EXPORT NSSCertDatabaseChromeOS : public NSSCertDatabase { | 
| public: | 
| + // |public_slot| is the NSS software slot for the user. | 
| + // |private_slot| is the TPM slot for the user (if a TPM is present). | 
| NSSCertDatabaseChromeOS(crypto::ScopedPK11Slot public_slot, | 
| crypto::ScopedPK11Slot private_slot); | 
| virtual ~NSSCertDatabaseChromeOS(); | 
| +#if defined(OS_CHROMEOS) | 
| 
 
Ryan Sleevi
2014/07/29 00:23:16
You're in a ChromeOS file. Isn't this a given?
 
pneubeck (no reviews)
2014/07/29 16:00:15
Done. Thanks for catching.
 
 | 
| + // |system_slot| is the system TPM slot, which is only enabled for certain | 
| + // users. | 
| + void SetSystemSlot(crypto::ScopedPK11Slot system_slot); | 
| +#endif | 
| + | 
| // NSSCertDatabase implementation. | 
| virtual void ListCertsSync(CertificateList* certs) OVERRIDE; | 
| virtual void ListCerts(const NSSCertDatabase::ListCertsCallback& callback) | 
| OVERRIDE; | 
| virtual void ListModules(CryptoModuleList* modules, bool need_rw) const | 
| OVERRIDE; | 
| + virtual crypto::ScopedPK11Slot GetSystemSlot() const OVERRIDE; | 
| // TODO(mattm): handle trust setting, deletion, etc correctly when certs exist | 
| // in multiple slots. | 
| @@ -40,6 +49,7 @@ class NET_EXPORT NSSCertDatabaseChromeOS : public NSSCertDatabase { | 
| CertificateList* certs); | 
| NSSProfileFilterChromeOS profile_filter_; | 
| + crypto::ScopedPK11Slot system_slot_; | 
| DISALLOW_COPY_AND_ASSIGN(NSSCertDatabaseChromeOS); | 
| }; |