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

Unified Diff: chrome/browser/certificate_manager_model.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 | « no previous file | chrome/browser/ui/crypto_module_password_dialog_nss.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/certificate_manager_model.cc
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index d1b43816a269e758be6be9af9e306557cbe92a32..84e26cae7bc890a721d0ffe5bfc71816d345125e 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -115,14 +115,13 @@ CertificateManagerModel::~CertificateManagerModel() {
void CertificateManagerModel::Refresh() {
DVLOG(1) << "refresh started";
- net::CryptoModuleList modules;
+ std::vector<crypto::ScopedPK11Slot> modules;
cert_db_->ListModules(&modules, false);
DVLOG(1) << "refresh waiting for unlocking...";
chrome::UnlockSlotsIfNecessary(
- modules,
- chrome::kCryptoModulePasswordListCerts,
+ std::move(modules), chrome::kCryptoModulePasswordListCerts,
net::HostPortPair(), // unused.
- NULL, // TODO(mattm): supply parent window.
+ NULL, // TODO(mattm): supply parent window.
base::Bind(&CertificateManagerModel::RefreshSlotsUnlocked,
base::Unretained(this)));
« no previous file with comments | « no previous file | chrome/browser/ui/crypto_module_password_dialog_nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698