diff options
Diffstat (limited to 'chromium/net/base/keygen_handler.h')
-rw-r--r-- | chromium/net/base/keygen_handler.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chromium/net/base/keygen_handler.h b/chromium/net/base/keygen_handler.h index 4895dacb57e..8262775505c 100644 --- a/chromium/net/base/keygen_handler.h +++ b/chromium/net/base/keygen_handler.h @@ -7,14 +7,15 @@ #include <string> +#include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "net/base/net_export.h" #include "url/gurl.h" -#if defined(USE_NSS) -#include "crypto/crypto_module_blocking_password_delegate.h" -#endif // defined(USE_NSS) +namespace crypto { +class NSSCryptoModuleDelegate; +} namespace net { @@ -41,12 +42,12 @@ class NET_EXPORT KeygenHandler { void set_stores_key(bool store) { stores_key_ = store;} #if defined(USE_NSS) - // Register the password delegate to be used if the token is unauthenticated. - // GenKeyAndSignChallenge runs on a worker thread, so using the blocking + // Register the delegate to be used to get the token to store the key in, and + // to get the password if the token is unauthenticated. + // GenKeyAndSignChallenge runs on a worker thread, so using a blocking // password callback is okay here. - // Takes ownership of the delegate. - void set_crypto_module_password_delegate( - crypto::CryptoModuleBlockingPasswordDelegate* delegate); + void set_crypto_module_delegate( + scoped_ptr<crypto::NSSCryptoModuleDelegate> delegate); #endif // defined(USE_NSS) private: @@ -56,8 +57,7 @@ class NET_EXPORT KeygenHandler { bool stores_key_; // should the generated key-pair be stored persistently? #if defined(USE_NSS) // The callback for requesting a password to the PKCS#11 token. - scoped_ptr<crypto::CryptoModuleBlockingPasswordDelegate> - crypto_module_password_delegate_; + scoped_ptr<crypto::NSSCryptoModuleDelegate> crypto_module_delegate_; #endif // defined(USE_NSS) }; |