| 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 940b9bab8f3ec3be6e253ae6f6b6afb5317e107c..1d9fd1131005fb59dc88c733dcc73ccde1d0556d 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.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
|
|
|