chrome/browser/renderer_host/render_message_filter.cc - Issue 6303004: Cleanup: replace usage of "pk11" with "pkcs11" or "crypto module", as appropriate.

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/renderer_host/render_message_filter.cc

Issue 6303004: Cleanup: replace usage of "pk11" with "pkcs11" or "crypto module", as appropriate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 11 months ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/gtk/crypto_module_password_dialog.cc ('K') | « chrome/browser/gtk/ssl_client_certificate_selector.cc ('k') | chrome/browser/ui/crypto_module_password_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/render_message_filter.cc

diff --git a/chrome/browser/renderer_host/render_message_filter.cc b/chrome/browser/renderer_host/render_message_filter.cc

index 3e23ae861d29f57b1a97810adff664bde917c1bd..910c746b4d5da2b9c144903481566539bd0a3978 100644

--- a/chrome/browser/renderer_host/render_message_filter.cc

+++ b/chrome/browser/renderer_host/render_message_filter.cc

@@ -85,7 +85,7 @@

#include "chrome/common/child_process_host.h"

#endif

#if defined(USE_NSS)

-#include "chrome/browser/ui/pk11_password_dialog.h"

+#include "chrome/browser/ui/crypto_module_password_dialog.h"

#endif

#if defined(USE_TCMALLOC)

#include "chrome/browser/browser_about_handler.h"

@@ -1383,9 +1383,9 @@ void RenderMessageFilter::OnKeygenOnWorkerThread(

#if defined(USE_NSS)

// Attach a password delegate so we can authenticate.

- keygen_handler.set_pk11_password_delegate(

- browser::NewPK11BlockingDialogDelegate(browser::kPK11PasswordKeygen,

- url.host()));

+ keygen_handler.set_crypto_module_password_delegate(

+ browser::NewCryptoModuleBlockingDialogDelegate(

+ browser::kCryptoModulePasswordKeygen, url.host()));

#endif // defined(USE_NSS)

ViewHostMsg_Keygen::WriteReplyParams(