chrome/browser/policy/network_configuration_updater.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/policy/network_configuration_updater.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: rebaesd Created 8 years, 3 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/policy/network_configuration_updater.h ('k') | chrome/browser/policy/network_configuration_updater_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/network_configuration_updater.cc

diff --git a/chrome/browser/policy/network_configuration_updater.cc b/chrome/browser/policy/network_configuration_updater.cc

index dcc2ead8be498098890ecffd0c1112a6267d46ce..68439a3f124679342265c3d468ae892c537214a0 100644

--- a/chrome/browser/policy/network_configuration_updater.cc

+++ b/chrome/browser/policy/network_configuration_updater.cc

@@ -22,7 +22,8 @@ NetworkConfigurationUpdater::NetworkConfigurationUpdater(

chromeos::NetworkLibrary* network_library)

: policy_change_registrar_(

policy_service, POLICY_DOMAIN_CHROME, std::string()),

- network_library_(network_library) {

+ network_library_(network_library),

+ allow_web_trust_(false) {

DCHECK(network_library_);

policy_change_registrar_.Observe(

key::kDeviceOpenNetworkConfiguration,

@@ -77,7 +78,7 @@ void NetworkConfigurationUpdater::ApplyNetworkConfiguration(

*cached_value = new_network_config;

std::string error;

if (!network_library_->LoadOncNetworks(new_network_config, "", onc_source,

- &error)) {

+ allow_web_trust_, &error)) {

LOG(WARNING) << "Network library failed to load ONC configuration:"

<< error;

}