chrome/browser/chrome_content_browser_client.h - Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_content_browser_client.h

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync to r235279 Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/chrome_content_browser_client.h

diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h

index d2ffce07bd18a446e695a13351eac526cdd758f9..ef6d56fb3dfbc7d438901800598277622534ee2c 100644

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

@@ -263,9 +263,9 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

bool* success) OVERRIDE;

#endif

#if defined(USE_NSS)

- virtual

- crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(

- const GURL& url) OVERRIDE;

+ virtual crypto::NSSCryptoModuleDelegate* GetKeygenCryptoModuleDelegate(

+ content::ResourceContext* context,

+ const GURL& url) OVERRIDE;

#endif

virtual bool IsPluginAllowedToCallRequestOSFileHandle(