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

Unified Diff: net/base/keygen_handler.h

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 years, 8 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 | « net/base/crypto_module.h ('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 8262775505ceb3b7726c59ca85a8198f5cb0b0e3..9cccee82287069db0e29b5a54b3905806a5bb4f3 100644
--- a/net/base/keygen_handler.h
+++ b/net/base/keygen_handler.h
@@ -41,24 +41,24 @@ class NET_EXPORT KeygenHandler {
// Exposed only for unit tests.
void set_stores_key(bool store) { stores_key_ = store;}
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
// 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.
void set_crypto_module_delegate(
scoped_ptr<crypto::NSSCryptoModuleDelegate> delegate);
-#endif // defined(USE_NSS)
+#endif // defined(USE_NSS_CERTS)
private:
int key_size_in_bits_; // key size in bits (usually 2048)
std::string challenge_; // challenge string sent by server
GURL url_; // the URL that requested the key
bool stores_key_; // should the generated key-pair be stored persistently?
-#if defined(USE_NSS)
+#if defined(USE_NSS_CERTS)
// The callback for requesting a password to the PKCS#11 token.
scoped_ptr<crypto::NSSCryptoModuleDelegate> crypto_module_delegate_;
-#endif // defined(USE_NSS)
+#endif // defined(USE_NSS_CERTS)
};
} // namespace net
« no previous file with comments | « net/base/crypto_module.h ('k') | net/base/keygen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698