Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: chrome/browser/resources/settings/internet_page/network_proxy.js

Issue 2528803002: MD Settings: Internet: Add/fix remaining policy items (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
},
/**

Powered by Google App Engine
This is Rietveld 408576698