Chromium Code Reviews| Index: chrome/browser/resources/settings/internet_page/network_proxy.js |
| diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.js b/chrome/browser/resources/settings/internet_page/network_proxy.js |
| index c7c02e631d2d7d3c4cc6e3a11c09ce964faff4ad..a18f5df31c77404d4245311528cfe0635803ede4 100644 |
| --- a/chrome/browser/resources/settings/internet_page/network_proxy.js |
| +++ b/chrome/browser/resources/settings/internet_page/network_proxy.js |
| @@ -9,6 +9,8 @@ |
| Polymer({ |
| is: 'network-proxy', |
| + behaviors: [CrPolicyNetworkBehavior], |
| + |
| properties: { |
| /** |
| * The network properties dictionary containing the proxy properties to |
| @@ -256,6 +258,21 @@ Polymer({ |
| }, |
| /** |
| + * @param {boolean} editable |
| + * @param {!CrOnc.NetworkProperties} networkProperties |
| + * @param {string} key |
| + * @return {boolean} Whether the property is editable. |
| + * @private |
| + */ |
| + isPropertyEditable_: function(editable, networkProperties, key) { |
| + if (!editable) |
| + return false; |
| + var property = /** @type {!CrOnc.NetworkProperty|undefined} */( |
| + this.get(key, networkProperties)); |
|
michaelpg
2015/10/10 06:01:32
4-space indent
stevenjb
2015/10/22 19:08:08
Done.
|
| + return !this.isNetworkPolicyEnforced(property); |
| + }, |
| + |
| + /** |
| * @param {string} property The property to test |
| * @param {string} value The value to test against |
| * @return {boolean} True if property == value |