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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/public/browser/content_browser_client.cc

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync to r235279 Created 7 years, 1 month 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
« chrome/browser/ui/crypto_module_delegate_nss.cc ('K') | « content/public/browser/content_browser_client.h ('k') | crypto/crypto.gyp » ('j') | crypto/nss_crypto_module_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/content_browser_client.cc
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 136a0126e4d1e2311e2c982bbc9c1d1b8515f9a2..735faddd37ac40aa621c7cd3165ca0c62cdf0176 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -295,8 +295,9 @@ const wchar_t* ContentBrowserClient::GetResourceDllName() {
#endif
#if defined(USE_NSS)
-crypto::CryptoModuleBlockingPasswordDelegate*
- ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
+crypto::NSSCryptoModuleDelegate*
+ContentBrowserClient::GetKeygenCryptoModuleDelegate(ResourceContext* context,
+ const GURL& url) {
return NULL;
}
#endif
« chrome/browser/ui/crypto_module_delegate_nss.cc ('K') | « content/public/browser/content_browser_client.h ('k') | crypto/crypto.gyp » ('j') | crypto/nss_crypto_module_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698