diff options
Diffstat (limited to 'chromium/chrome/browser/resources/settings/internet_page/network_proxy.js')
-rw-r--r-- | chromium/chrome/browser/resources/settings/internet_page/network_proxy.js | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/chromium/chrome/browser/resources/settings/internet_page/network_proxy.js b/chromium/chrome/browser/resources/settings/internet_page/network_proxy.js index c7c02e631d2..1d9fd113100 100644 --- a/chromium/chrome/browser/resources/settings/internet_page/network_proxy.js +++ b/chromium/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 @@ -220,7 +222,7 @@ Polymer({ * @param {Event} event The add proxy exclusion event. * @private */ - onAddProxyExclusion_: function(event) { + onAddProxyExclusionTap_: function(event) { var value = this.$.proxyExclusion.value; if (!value) return; @@ -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.ManagedProperty|undefined} */( + this.get(key, networkProperties)); + 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 |