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

Unified Diff: chrome/browser/policy/device_policy_cache.cc

Issue 8382005: Rename network configuration policy as per Zhanyong's proposal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test. Created 9 years, 2 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/app/policy/policy_templates.json ('k') | chrome/browser/policy/device_policy_cache_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/device_policy_cache.cc
diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc
index dab3f9183e4ef9c044c752ed749ad98f33bbb602..c626080e57f11e10f73dce9aac3b6cc5b636f76c 100644
--- a/chrome/browser/policy/device_policy_cache.cc
+++ b/chrome/browser/policy/device_policy_cache.cc
@@ -353,10 +353,11 @@ void DevicePolicyCache::DecodeDevicePolicy(
chromeos::CrosLibrary::Get()->GetUpdateLibrary()->SetReleaseTrack(channel);
}
- if (policy.has_network_configuration() &&
- policy.network_configuration().has_network_configuration()) {
- std::string config(policy.network_configuration().network_configuration());
- mandatory->Set(kPolicyDeviceNetworkConfiguration,
+ if (policy.has_open_network_configuration() &&
+ policy.open_network_configuration().has_open_network_configuration()) {
+ std::string config(
+ policy.open_network_configuration().open_network_configuration());
+ mandatory->Set(kPolicyDeviceOpenNetworkConfiguration,
Value::CreateStringValue(config));
}
}
« no previous file with comments | « chrome/app/policy/policy_templates.json ('k') | chrome/browser/policy/device_policy_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698