chrome/browser/ui/webui/options/certificate_manager_handler.cc - Issue 2711113002: net: remove CryptoModuleList typedef

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/ui/webui/options/certificate_manager_handler.cc

Issue 2711113002: net: remove CryptoModuleList typedef (Closed)

Patch Set: one more fix for chromeos 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:

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..b50bd9072d8e06dfcc1950da5eee43177d797c91 100644

--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc

+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc

@@ -839,8 +839,8 @@ 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,