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

Unified Diff: chrome/browser/ui/webui/settings/certificates_handler.cc

Issue 2711113002: net: remove CryptoModuleList typedef (Closed)
Patch Set: more std::moves Created 3 years, 10 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/browser/ui/webui/options/certificate_manager_handler.cc ('k') | net/base/crypto_module.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/certificates_handler.cc
diff --git a/chrome/browser/ui/webui/settings/certificates_handler.cc b/chrome/browser/ui/webui/settings/certificates_handler.cc
index 62a4191a5cfed90a4c6ad20eec77204cb4ebccb8..24e40be3104aae5ca3d260fb3490892a90797b13 100644
--- a/chrome/browser/ui/webui/settings/certificates_handler.cc
+++ b/chrome/browser/ui/webui/settings/certificates_handler.cc
@@ -723,10 +723,10 @@ void CertificatesHandler::HandleImportPersonalPasswordSelected(
slot_ = certificate_manager_model_->cert_db()->GetPublicSlot();
}
- net::CryptoModuleList modules;
- modules.push_back(net::CryptoModule::CreateFromHandle(slot_.get()));
+ std::vector<crypto::ScopedPK11Slot> modules;
+ modules.push_back(crypto::ScopedPK11Slot(PK11_ReferenceSlot(slot_.get())));
chrome::UnlockSlotsIfNecessary(
- modules, chrome::kCryptoModulePasswordCertImport,
+ std::move(modules), chrome::kCryptoModulePasswordCertImport,
net::HostPortPair(), // unused.
GetParentWindow(),
base::Bind(&CertificatesHandler::ImportPersonalSlotUnlocked,
« no previous file with comments | « chrome/browser/ui/webui/options/certificate_manager_handler.cc ('k') | net/base/crypto_module.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698