| Index: content/public/browser/content_browser_client.h
|
| diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
| index e862ca97d371680d01b6f429a9e5fbd6cc3b5ac8..b3816f85086316761688a5c9749a663a9b966ae2 100644
|
| --- a/content/public/browser/content_browser_client.h
|
| +++ b/content/public/browser/content_browser_client.h
|
| @@ -44,7 +44,7 @@ class DictionaryValue;
|
| class FilePath;
|
| }
|
| namespace crypto {
|
| -class CryptoModuleBlockingPasswordDelegate;
|
| +class NSSCryptoModuleDelegate;
|
| }
|
|
|
| namespace gfx {
|
| @@ -592,11 +592,11 @@ class CONTENT_EXPORT ContentBrowserClient {
|
| #endif
|
|
|
| #if defined(USE_NSS)
|
| - // Return a delegate to authenticate and unlock |module|.
|
| - // This is called on a worker thread.
|
| - virtual
|
| - crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
|
| - const GURL& url);
|
| + // Return a delegate to select a module for keygen and to authenticate and
|
| + // unlock it. This is called on the IO thread.
|
| + virtual crypto::NSSCryptoModuleDelegate* GetKeygenCryptoModuleDelegate(
|
| + ResourceContext* context,
|
| + const GURL& url);
|
| #endif
|
|
|
| // Returns true if plugin referred to by the url can use
|
|
|