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

Unified Diff: ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js

Issue 2467123003: Settings: Internet: Update proxy controlled indicator and fields. (Closed)
Patch Set: Rebase Created 4 years, 1 month 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
« no previous file with comments | « ui/webui/resources/cr_elements/policy/cr_policy_network_behavior.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js
diff --git a/ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js b/ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js
index 29c09719c33ed62cf53786c317cff6e2b9dd4405..d3ca5f4dcaaf0a2b67f9585815db13e9cb744cda 100644
--- a/ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js
+++ b/ui/webui/resources/cr_elements/policy/cr_policy_network_indicator.js
@@ -37,7 +37,7 @@ Polymer({
* @private
*/
propertyChanged_: function(property) {
- if (!this.isNetworkPolicyControlled(property)) {
+ if (!this.isControlled(property)) {
this.indicatorType = CrPolicyIndicatorType.NONE;
return;
}
@@ -62,6 +62,8 @@ Polymer({
this.indicatorType = CrPolicyIndicatorType.USER_POLICY;
} else if (effective == 'DevicePolicy') {
this.indicatorType = CrPolicyIndicatorType.DEVICE_POLICY;
+ } else if (effective == 'ActiveExtension') {
+ this.indicatorType = CrPolicyIndicatorType.EXTENSION;
} else {
this.indicatorType = CrPolicyIndicatorType.NONE;
}
« no previous file with comments | « ui/webui/resources/cr_elements/policy/cr_policy_network_behavior.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698