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

Unified Diff: chromeos/network/onc/onc_validator.cc

Issue 1431563005: Handle prohibited technologies in device policy ONC (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 | « chromeos/network/network_state_handler.cc ('k') | chromeos/network/onc/onc_validator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_validator.cc
diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc
index 657456169ee06ba734a90d3972e00f764e984af2..ee681aacf185b6fe91fd440fa6cb978812b0af9d 100644
--- a/chromeos/network/onc/onc_validator.cc
+++ b/chromeos/network/onc/onc_validator.cc
@@ -887,11 +887,11 @@ bool Validator::ValidateGlobalNetworkConfiguration(
const base::ListValue* disabled_network_types = NULL;
if (result->GetListWithoutPathExpansion(kDisableNetworkTypes,
&disabled_network_types)) {
- // The kDisableNetworkTypes field is only allowed in user policy.
+ // The kDisableNetworkTypes field is only allowed in device policy.
if (!disabled_network_types->empty() &&
- onc_source_ != ::onc::ONC_SOURCE_USER_POLICY) {
+ onc_source_ != ::onc::ONC_SOURCE_DEVICE_POLICY) {
error_or_warning_found_ = true;
- LOG(ERROR) << "Disabled network types only allowed in user policy.";
+ LOG(ERROR) << "Disabled network types only allowed in device policy.";
return false;
}
}
« no previous file with comments | « chromeos/network/network_state_handler.cc ('k') | chromeos/network/onc/onc_validator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698