summaryrefslogtreecommitdiffstats
path: root/net/base/keygen_handler.h
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 17:37:14 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-14 17:37:14 +0000
commit4b559b4ddffc0b7f688019bcb80658f05e063af7 (patch)
tree0be21d8914de707f5125d2cb66733cbcf088606c /net/base/keygen_handler.h
parent056dd45d610de34312344445d7b078a31f4a1e20 (diff)
downloadchromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.zip
chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.gz
chromium_src-4b559b4ddffc0b7f688019bcb80658f05e063af7.tar.bz2
Move crypto files out of base, to a top level directory.
src/crypto is now an independent project that contains our cryptographic primitives (except md5 and sha1). This removes the base dependency from nss, openssl and sqlite. BUG=76996 TEST=none Review URL: http://codereview.chromium.org/6805019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/keygen_handler.h')
-rw-r--r--net/base/keygen_handler.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/base/keygen_handler.h b/net/base/keygen_handler.h
index 4dd7bbf..6927763 100644
--- a/net/base/keygen_handler.h
+++ b/net/base/keygen_handler.h
@@ -13,9 +13,7 @@
#include "googleurl/src/gurl.h"
#if defined(USE_NSS)
-namespace base {
-class CryptoModuleBlockingPasswordDelegate;
-};
+#include "crypto/crypto_module_blocking_password_delegate.h"
#endif // defined(USE_NSS)
namespace net {
@@ -48,7 +46,7 @@ class KeygenHandler {
// password callback is okay here.
// Takes ownership of the delegate.
void set_crypto_module_password_delegate(
- base::CryptoModuleBlockingPasswordDelegate* delegate);
+ crypto::CryptoModuleBlockingPasswordDelegate* delegate);
#endif // defined(USE_NSS)
private:
@@ -58,7 +56,7 @@ 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::CryptoModuleBlockingPasswordDelegate>
+ scoped_ptr<crypto::CryptoModuleBlockingPasswordDelegate>
crypto_module_password_delegate_;
#endif // defined(USE_NSS)
};