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

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: unit_test compile fix Created 7 years 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
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 b404a974e2ec2be6f5f8eab091522d0c66c04f12..553c748b3d18bb26f99de8ef4709131ead6d8f41 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -8,6 +8,10 @@
#include "ui/gfx/image/image_skia.h"
#include "url/gurl.h"
+#if defined(USE_NSS)
jam 2013/12/12 06:42:50 ditto
mattm 2013/12/12 21:49:18 Done.
+#include "crypto/nss_crypto_module_delegate.h"
+#endif
+
namespace content {
BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts(
@@ -298,13 +302,6 @@ const wchar_t* ContentBrowserClient::GetResourceDllName() {
}
#endif
-#if defined(USE_NSS)
-crypto::CryptoModuleBlockingPasswordDelegate*
- ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
- return NULL;
-}
-#endif
-
bool ContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
content::BrowserContext* browser_context,
const GURL& url) {

Powered by Google App Engine
This is Rietveld 408576698