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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Behavior for policy controlled settings prefs.
  */
 
 /** @polymerBehavior */
 var CrPolicyPrefBehavior = {
   /**
    * @param {!chrome.settingsPrivate.PrefObject} pref
    * @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;
   },
 
   /**
    * @param {!chrome.settingsPrivate.ControlledBy|undefined} controlledBy
    * @param {!chrome.settingsPrivate.Enforcement|undefined} enforcement
    * @return {CrPolicyIndicatorType} The indicator type based on |controlledBy|
    *     and |enforcement|.
    */
   getIndicatorType: function(controlledBy, enforcement) {
     if (enforcement == chrome.settingsPrivate.Enforcement.RECOMMENDED)
       return CrPolicyIndicatorType.RECOMMENDED;
     if (enforcement == chrome.settingsPrivate.Enforcement.ENFORCED) {
       switch (controlledBy) {
         case chrome.settingsPrivate.ControlledBy.PRIMARY_USER:
           return CrPolicyIndicatorType.PRIMARY_USER;
         case chrome.settingsPrivate.ControlledBy.OWNER:
           return CrPolicyIndicatorType.OWNER;
         case chrome.settingsPrivate.ControlledBy.USER_POLICY:
           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;
   },
 };