| 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)
|
| +#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) {
|
|
|