Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1454)

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: Fixed upload 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
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..046d96347a9c3a3ee961089467dd7e4853088675 100644
--- a/chrome/browser/policy/network_configuration_updater.cc
+++ b/chrome/browser/policy/network_configuration_updater.cc
@@ -19,10 +19,12 @@ const char NetworkConfigurationUpdater::kEmptyConfiguration[] =
NetworkConfigurationUpdater::NetworkConfigurationUpdater(
PolicyService* policy_service,
- chromeos::NetworkLibrary* network_library)
+ chromeos::NetworkLibrary* network_library,
+ bool allow_web_trust)
: policy_change_registrar_(
policy_service, POLICY_DOMAIN_CHROME, std::string()),
- network_library_(network_library) {
+ network_library_(network_library),
+ allow_web_trust_(allow_web_trust) {
DCHECK(network_library_);
policy_change_registrar_.Observe(
key::kDeviceOpenNetworkConfiguration,
@@ -77,7 +79,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;
}

Powered by Google App Engine
This is Rietveld 408576698