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 0a91186650aaca5e48153fdde20924dc58423af6..12b73f7194c51f5260a586bd71699f9acd7d0068 100644 |
--- a/content/public/browser/content_browser_client.cc |
+++ b/content/public/browser/content_browser_client.cc |
@@ -5,6 +5,7 @@ |
#include "content/public/browser/content_browser_client.h" |
#include "base/files/file_path.h" |
+#include "net/ssl/client_cert_store.h" |
#include "ui/gfx/image/image_skia.h" |
#include "url/gurl.h" |
@@ -211,6 +212,11 @@ WebKit::WebNotificationPresenter::Permission |
return WebKit::WebNotificationPresenter::PermissionAllowed; |
} |
+scoped_ptr<net::ClientCertStore> ContentBrowserClient::GetClientCertStore( |
+ ResourceContext* context) { |
+ return scoped_ptr<net::ClientCertStore>(); |
+} |
+ |
bool ContentBrowserClient::CanCreateWindow( |
const GURL& opener_url, |
const GURL& opener_top_level_frame_url, |
@@ -294,13 +300,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) { |