chrome/browser/certificate_manager_model.cc - Issue 1423333006: Adding User Certificate (.crt) Import to Certificate Manager

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/certificate_manager_model.cc

Issue 1423333006: Adding User Certificate (.crt) Import to Certificate Manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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/certificate_manager_model.h ('k') | chrome/browser/ui/webui/options/certificate_manager_handler.cc » ('j') | chrome/browser/ui/webui/options/certificate_manager_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 81803ea0eae4644ca56bb5c165599350ec5b3d0d..507b74811d906b8fcf44c8684ca4cf1653b881e9 100644

--- a/chrome/browser/certificate_manager_model.cc

+++ b/chrome/browser/certificate_manager_model.cc

@@ -166,6 +166,13 @@ int CertificateManagerModel::ImportFromPKCS12(net::CryptoModule* module,

return result;

}

+int CertificateManagerModel::ImportUserCert(const std::string& data) {

+ int result = cert_db_->ImportUserCert(data);

+ if (result == net::OK)

+ Refresh();

+ return result;

bool CertificateManagerModel::ImportCACerts(

const net::CertificateList& certificates,

net::NSSCertDatabase::TrustBits trust_bits,