| 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 974de27c38904e66d76531285ca14bfb7952a91b..e3defda2468a441c81fdac3dfcb06bc213a54eab 100644
|
| --- a/chrome/browser/resources/settings/internet_page/network_proxy.js
|
| +++ b/chrome/browser/resources/settings/internet_page/network_proxy.js
|
| @@ -336,7 +336,7 @@ Polymer({
|
| * @return {boolean}
|
| * @private
|
| */
|
| - getShowNetworkPolicyIndicator_: function() {
|
| + shouldShowNetworkPolicyIndicator_: function() {
|
| let property = this.getProxySettingsTypeProperty_();
|
| return !!property && !this.isExtensionControlled(property) &&
|
| this.isNetworkPolicyEnforced(property);
|
| @@ -346,7 +346,7 @@ Polymer({
|
| * @return {boolean}
|
| * @private
|
| */
|
| - getShowPrefPolicyIndicator_: function() {
|
| + shouldShowExtensionIndicator_: function() {
|
| let property = this.getProxySettingsTypeProperty_();
|
| return !!property && this.isExtensionControlled(property);
|
| },
|
| @@ -356,7 +356,7 @@ Polymer({
|
| * @return {boolean}
|
| * @private
|
| */
|
| - getShowAllowShared_: function(property) {
|
| + shouldShowAllowShared_: function(property) {
|
| return !this.isControlled(property) && this.isShared_();
|
| },
|
|
|
| @@ -389,7 +389,7 @@ Polymer({
|
| */
|
| isProxyEditable_: function() {
|
| let property = this.getProxySettingsTypeProperty_();
|
| - return !!property && this.isEditable_(property);
|
| + return !property || this.isEditable_(property);
|
| },
|
|
|
| /**
|
|
|