Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1170)

Unified Diff: net/ssl/client_cert_store_chromeos.h

Issue 419013003: Replace c/b/nss_context by a KeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, format. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f14619ab1e5a6ec899986dc3137a36795741f1d3..de619ff0d8c221e0a16d0042271a3aba24b2511f 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);

Powered by Google App Engine
This is Rietveld 408576698