Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 3070791abbf69a9f20f1cfd4ada7ebfa35e13f39..0311ec7c74a9d4b15011dbd364d69d18be0039e5 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -50,6 +50,7 @@ |
#include "chrome/browser/nacl_host/nacl_host_message_filter.h" |
#include "chrome/browser/nacl_host/nacl_process_host.h" |
#include "chrome/browser/net/chrome_net_log.h" |
+#include "chrome/browser/net/keygen_handler.h" |
#include "chrome/browser/notifications/desktop_notification_service.h" |
#include "chrome/browser/notifications/desktop_notification_service_factory.h" |
#include "chrome/browser/platform_util.h" |
@@ -1695,6 +1696,15 @@ void ChromeContentBrowserClient::AddCertificate( |
render_process_id, render_view_id); |
} |
+void ChromeContentBrowserClient::Keygen( |
+ content::ResourceContext* context, |
+ int key_size_in_bits, |
+ const std::string& challenge, |
+ const GURL& url, |
+ const base::Callback<void(const std::string*)>& callback) { |
+ chrome::Keygen(context, key_size_in_bits, challenge, url, true, callback); |
+} |
+ |
content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { |
return MediaCaptureDevicesDispatcher::GetInstance(); |
} |
@@ -2381,13 +2391,4 @@ void ChromeContentBrowserClient::PreSpawnRenderer( |
} |
#endif |
-#if defined(USE_NSS) |
-crypto::CryptoModuleBlockingPasswordDelegate* |
- ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
- const GURL& url) { |
- return chrome::NewCryptoModuleBlockingDialogDelegate( |
- chrome::kCryptoModulePasswordKeygen, url.host()); |
-} |
-#endif |
- |
} // namespace chrome |