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

Unified Diff: chrome/browser/ui/webui/options/certificate_manager_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
Index: chrome/browser/ui/webui/options/certificate_manager_handler.cc
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index 1ff301cafa6307fec01635a941a5873d8d04eb9e..d23446bf6ca63cdbb6ecac8300a2b352ae2e1be8 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
@@ -839,11 +839,10 @@ void CertificateManagerHandler::ImportPersonalPasswordSelected(
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(&CertificateManagerHandler::ImportPersonalSlotUnlocked,
« no previous file with comments | « chrome/browser/ui/crypto_module_password_dialog_nss.cc ('k') | chrome/browser/ui/webui/settings/certificates_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698