[MD settings] show icon when content settings are controlled by an extension

ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.js

Index: ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.js
diff --git a/ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.js b/ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.js
index 0fd367c6238f3417266d038abf570cd81053fef5..28f8d3db58e289a5fe28797dbd771f1402183c5f 100644
--- a/ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.js
+++ b/ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.js
@@ -13,8 +13,7 @@ var CrPolicyPrefBehavior = {
    * @return {boolean} True if the pref is controlled by an enforced policy.
    */
   isPrefPolicyControlled: function(pref) {
-    return pref.enforcement == chrome.settingsPrivate.Enforcement.ENFORCED &&
-        pref.controlledBy != chrome.settingsPrivate.ControlledBy.EXTENSION;

[Dan Beam, 2017/02/24 04:44:20]

policy != extension

[Dan Beam, 2017/02/24 04:45:45]

as in: this method is named "isPrefPolicyControlled".  unless the extension is
installed by policy (adminstrators can create a force list of extension IDs +
sources), a preference that's controlled by an extension is ... controlled by an
extension (not policy)

[dschuyler, 2017/02/24 21:36:46]

Acknowledged.

[dschuyler, 2017/02/24 21:36:46]

Ah, and this function isn't really checking whether the pref is policy
controlled, it's testing whether it is enforced. And the places this function is
being called are looking for whether a control should be disabled, where
enforced is the key topic (rather than policy).

+    return pref.enforcement == chrome.settingsPrivate.Enforcement.ENFORCED;
   },
 
   /**
@@ -36,6 +35,8 @@ var CrPolicyPrefBehavior = {
           return CrPolicyIndicatorType.USER_POLICY;
         case chrome.settingsPrivate.ControlledBy.DEVICE_POLICY:
           return CrPolicyIndicatorType.DEVICE_POLICY;
+        case chrome.settingsPrivate.ControlledBy.EXTENSION:
+          return CrPolicyIndicatorType.EXTENSION;
       }
     }
     return CrPolicyIndicatorType.NONE;