| 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 a7ceae65ca237042aaa52c535d3f2f9e21a1f7b0..a161ed467130d514081e4a5b3b414af87c02f698 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -52,6 +52,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"
|
| @@ -1789,6 +1790,16 @@ 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_browser_net::Keygen(
|
| + context, key_size_in_bits, challenge, url, true, callback);
|
| +}
|
| +
|
| content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() {
|
| return MediaCaptureDevicesDispatcher::GetInstance();
|
| }
|
| @@ -2527,13 +2538,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
|
|
|