chrome/browser/chromeos/policy/user_network_configuration_updater.cc - Issue 148183013: Use per-user nssdb in onc certificate importer

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/chromeos/policy/user_network_configuration_updater.cc

Issue 148183013: Use per-user nssdb in onc certificate importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 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

« chrome/browser/chromeos/policy/network_configuration_updater.cc ('K') | « chrome/browser/chromeos/policy/user_network_configuration_updater.h ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_network_configuration_updater.cc

diff --git a/chrome/browser/chromeos/policy/user_network_configuration_updater.cc b/chrome/browser/chromeos/policy/user_network_configuration_updater.cc

index 1c7ac35da91e1e0daf2c53103eb33553fc96de91..4d5d5f4f8c557df02244932734c8f760cb568b35 100644

--- a/chrome/browser/chromeos/policy/user_network_configuration_updater.cc

+++ b/chrome/browser/chromeos/policy/user_network_configuration_updater.cc

@@ -67,11 +67,13 @@ void UserNetworkConfigurationUpdater::GetWebTrustedCertificates(

}

void UserNetworkConfigurationUpdater::ImportCertificates(

- const base::ListValue& certificates_onc) {

+ const base::ListValue& certificates_onc,

+ net::NSSCertDatabase* target_nssdb) {

web_trust_certs_.clear();

certificate_importer_->ImportCertificates(

certificates_onc,

onc_source_,

+ target_nssdb,

allow_trusted_certificates_from_policy_ ? &web_trust_certs_ : NULL);

NotifyTrustAnchorsChanged();