| 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 28865377a4bc4cdf8b7282e3e8c0aa6c2bc7eca8..b745d85ff20a4aeba66cd3a46bfeaa976d12fcdf 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -189,7 +189,7 @@
|
| #endif
|
|
|
| #if defined(USE_NSS)
|
| -#include "chrome/browser/ui/crypto_module_password_dialog.h"
|
| +#include "chrome/browser/ui/crypto_module_delegate_nss.h"
|
| #endif
|
|
|
| #if !defined(OS_CHROMEOS)
|
| @@ -2622,11 +2622,12 @@ void ChromeContentBrowserClient::PreSpawnRenderer(
|
| #endif
|
|
|
| #if defined(USE_NSS)
|
| -crypto::CryptoModuleBlockingPasswordDelegate*
|
| - ChromeContentBrowserClient::GetCryptoPasswordDelegate(
|
| +crypto::NSSCryptoModuleDelegate*
|
| + ChromeContentBrowserClient::GetKeygenCryptoModuleDelegate(
|
| + content::ResourceContext* context,
|
| const GURL& url) {
|
| - return chrome::NewCryptoModuleBlockingDialogDelegate(
|
| - chrome::kCryptoModulePasswordKeygen, url.host());
|
| + return chrome::NewNSSCryptoModuleDelegate(
|
| + context, chrome::kCryptoModulePasswordKeygen, url.host());
|
| }
|
| #endif
|
|
|
|
|