chrome/browser/chromeos/cros/network_library_impl_base.cc - Issue 10868076: Only import certificates with Web trust from ONC if the user is managed and matches the enterprise …

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/cros/network_library_impl_base.cc

Issue 10868076: Only import certificates with Web trust from ONC if the user is managed and matches the enterprise … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 4 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 | « chrome/browser/chromeos/cros/network_library_impl_base.h ('k') | chrome/browser/chromeos/cros/onc_network_parser.h » ('j') | chrome/browser/chromeos/cros/onc_network_parser.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/cros/network_library_impl_base.cc

diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc

index 4df7501774225c98d08cd279d8a38e6ae2cf6bec..897aff2f79a5cbab6dae2bddffc42a3a53cfd03c 100644

--- a/chrome/browser/chromeos/cros/network_library_impl_base.cc

+++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc

@@ -1152,8 +1152,11 @@ void NetworkLibraryImplBase::SwitchToPreferredNetwork() {

bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,

const std::string& passphrase,

NetworkUIData::ONCSource source,

+ bool allow_web_trust_from_policy,

std::string* error) {

OncNetworkParser parser(onc_blob, passphrase, source);

+ if (allow_web_trust_from_policy)

+ parser.AllowWebTrustFromPolicy();

if (!parser.parse_error().empty()) {

if (error)