| Index: net/ssl/client_cert_store_chromeos.h
|
| diff --git a/net/ssl/client_cert_store_chromeos.h b/net/ssl/client_cert_store_chromeos.h
|
| index 940888d1539a685cb1e71b73d46513c24e83df32..e2753e9de42464901fe642d381a78053b5c2508d 100644
|
| --- a/net/ssl/client_cert_store_chromeos.h
|
| +++ b/net/ssl/client_cert_store_chromeos.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <string>
|
|
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "crypto/scoped_nss_types.h"
|
| #include "net/cert/nss_profile_filter_chromeos.h"
|
| #include "net/ssl/client_cert_store_nss.h"
|
| @@ -19,8 +20,7 @@ class NET_EXPORT ClientCertStoreChromeOS : public ClientCertStoreNSS {
|
| // the user's private and public slots. If |use_system_slot| is true, certs on
|
| // the system slot will also be returned.
|
| ClientCertStoreChromeOS(
|
| - bool use_system_slot,
|
| - const std::string& username_hash,
|
| + scoped_ptr<NSSProfileFilterChromeOSFactory> profile_filter_factory,
|
| const PasswordDelegateFactory& password_delegate_factory);
|
| virtual ~ClientCertStoreChromeOS();
|
|
|
| @@ -37,14 +37,12 @@ class NET_EXPORT ClientCertStoreChromeOS : public ClientCertStoreNSS {
|
| CertificateList* selected_certs) OVERRIDE;
|
|
|
| private:
|
| - void DidGetSystemAndPrivateSlot(const SSLCertRequestInfo* request,
|
| - CertificateList* selected_certs,
|
| - const base::Closure& callback,
|
| - crypto::ScopedPK11Slot system_slot,
|
| - crypto::ScopedPK11Slot private_slot);
|
| -
|
| - bool use_system_slot_;
|
| - std::string username_hash_;
|
| + void DidGetProfileFilter(const SSLCertRequestInfo* request,
|
| + CertificateList* selected_certs,
|
| + const base::Closure& callback,
|
| + const NSSProfileFilterChromeOS& profile_filter);
|
| +
|
| + scoped_ptr<NSSProfileFilterChromeOSFactory> profile_filter_factory_;
|
| NSSProfileFilterChromeOS profile_filter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ClientCertStoreChromeOS);
|
|
|