Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1047)

Unified Diff: chrome/browser/dom_ui/options/certificate_manager_handler.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: sorting fix again 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/renderer_host/render_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/options/certificate_manager_handler.cc
diff --git a/chrome/browser/dom_ui/options/certificate_manager_handler.cc b/chrome/browser/dom_ui/options/certificate_manager_handler.cc
index ac98bf0eb52c2613f52b213b8a67eb9f22adf057..dfe02b217af4c4b05c2ffd99924fa576b99f1cb9 100644
--- a/chrome/browser/dom_ui/options/certificate_manager_handler.cc
+++ b/chrome/browser/dom_ui/options/certificate_manager_handler.cc
@@ -18,7 +18,7 @@
#include "chrome/browser/gtk/certificate_dialogs.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_contents_view.h"
-#include "chrome/browser/ui/pk11_password_dialog.h"
+#include "chrome/browser/ui/crypto_module_password_dialog.h"
#include "grit/generated_resources.h"
#include "net/base/crypto_module.h"
#include "net/base/x509_certificate.h"
@@ -538,7 +538,7 @@ void CertificateManagerHandler::ExportPersonalPasswordSelected(
// TODO(mattm): do something smarter about non-extractable keys
browser::UnlockCertSlotIfNecessary(
selected_cert_list_[0].get(),
- browser::kPK11PasswordCertExport,
+ browser::kCryptoModulePasswordCertExport,
"", // unused.
NewCallback(this,
&CertificateManagerHandler::ExportPersonalSlotsUnlocked));
@@ -631,7 +631,7 @@ void CertificateManagerHandler::ImportPersonalFileRead(
browser::UnlockSlotIfNecessary(
module_.get(),
- browser::kPK11PasswordCertImport,
+ browser::kCryptoModulePasswordCertImport,
"", // unused.
NewCallback(this,
&CertificateManagerHandler::ImportPersonalSlotUnlocked));
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/renderer_host/render_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698