Index: chrome/browser/resources/settings/internet_page/network_property_list.js |
diff --git a/chrome/browser/resources/settings/internet_page/network_property_list.js b/chrome/browser/resources/settings/internet_page/network_property_list.js |
index 51faf09b4cb7791843c8d0622cce8f927c8fb548..b988501a46d3b1c8859f2d9b64d5aee9f01dcedc 100644 |
--- a/chrome/browser/resources/settings/internet_page/network_property_list.js |
+++ b/chrome/browser/resources/settings/internet_page/network_property_list.js |
@@ -14,6 +14,8 @@ |
Polymer({ |
is: 'network-property-list', |
+ behaviors: [CrPolicyNetworkBehavior], |
+ |
properties: { |
/** |
* The dictionary containing the properties to display. |
@@ -116,8 +118,11 @@ Polymer({ |
showNoEdit_: function(propertyDict, editFieldTypes, key) { |
if (!this.hasPropertyValue_(propertyDict, key)) |
return false; |
- var editType = editFieldTypes[key]; |
- return !editType; |
+ var property = /** @type {!CrOnc.ManagedProperty|undefined} */( |
+ this.get(key, propertyDict)); |
+ if (this.isNetworkPolicyEnforced(property)) |
+ return true; |
+ return !editFieldTypes[key]; |
}, |
/** |
@@ -130,6 +135,12 @@ Polymer({ |
* @private |
*/ |
showEdit_: function(propertyDict, editFieldTypes, key, type) { |
+ if (!this.hasPropertyValue_(propertyDict, key)) |
+ return false; |
+ var property = /** @type {!CrOnc.ManagedProperty|undefined} */( |
+ this.get(key, propertyDict)); |
+ if (this.isNetworkPolicyEnforced(property)) |
+ return false; |
return editFieldTypes[key] == type; |
}, |