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

Unified Diff: net/base/keygen_handler.h

Issue 6303004: Cleanup: replace usage of "pk11" with "pkcs11" or "crypto module", as appropriate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sorting fix again Created 9 years, 11 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | net/base/keygen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/keygen_handler.h
diff --git a/net/base/keygen_handler.h b/net/base/keygen_handler.h
index d12d0847afa0c915b132044b67c608759a6a85e3..817720dbd03b413584fb0089a124d63f26bcaf4a 100644
--- a/net/base/keygen_handler.h
+++ b/net/base/keygen_handler.h
@@ -14,7 +14,7 @@
#if defined(USE_NSS)
namespace base {
-class PK11BlockingPasswordDelegate;
+class CryptoModuleBlockingPasswordDelegate;
};
#endif // defined(USE_NSS)
@@ -47,7 +47,8 @@ class KeygenHandler {
// GenKeyAndSignChallenge runs on a worker thread, so using the blocking
// password callback is okay here.
// Takes ownership of the delegate.
- void set_pk11_password_delegate(base::PK11BlockingPasswordDelegate* delegate);
+ void set_crypto_module_password_delegate(
+ base::CryptoModuleBlockingPasswordDelegate* delegate);
#endif // defined(USE_NSS)
private:
@@ -57,7 +58,8 @@ class 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<base::PK11BlockingPasswordDelegate> pk11_password_delegate_;
+ scoped_ptr<base::CryptoModuleBlockingPasswordDelegate>
+ crypto_module_password_delegate_;
#endif // defined(USE_NSS)
};
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | net/base/keygen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698