[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) {

[dschuyler, 2017/02/28 00:15:18]

This is renamed as isPrefEnforced.

-    return pref.enforcement == chrome.settingsPrivate.Enforcement.ENFORCED &&
-        pref.controlledBy != chrome.settingsPrivate.ControlledBy.EXTENSION;
+  properties: {
+    /**
+     * Showing that an extension is controlling a pref is sometimes done with a

[stevenjb, 2017/02/28 02:59:33]

'In those'

+     * different UI (e.g. extension-controlled-indicator). In  those cases,
+     * avoid showing an (extra) indicator here.
+     * @public
+     */
+    ignoreExtensions: Boolean,

[Dan Beam, 2017/02/28 02:30:03]

ignoreControllingExtensions?

[stevenjb, 2017/02/28 02:59:33]

FWIW, I kind of prefer just 'ignore-extensions', I think the context is
sufficient.

[Dan Beam, 2017/02/28 03:02:11]

the context in this file.  but look at other invocations

[stevenjb, 2017/02/28 19:56:28]

I was taking other invocations into consideration.

[Dan Beam, 2017/02/28 20:00:38]

aight, just making sure you saw them

   },
 
   /**
+   * Is the |pref| controlled by something that prevents user control of the
+   * preference.
+   * @param {!chrome.settingsPrivate.PrefObject} pref
+   * @return {boolean} True if the pref is enforced.
+   */
+  isPrefEnforced: function(pref) {
+    if (this.ignoreExtensions &&
+        pref.controlledBy == chrome.settingsPrivate.ControlledBy.EXTENSION) {
+      return false;
+    }
+    return pref.enforcement == chrome.settingsPrivate.Enforcement.ENFORCED;

[dschuyler, 2017/02/28 00:15:18]

Lines 28 to 32 can be expressed in one line of logical operators if preferred.

[Dan Beam, 2017/02/28 02:30:03]

eh, this is fine, it's very clear

[stevenjb, 2017/02/28 02:59:33]

Make sure to merge this with Michael's change (I just lgtm'd it). It uses some
pseudo-inheretance to reduce redundant code.

FWIW, I'm not sure that the new name is sufficiently clearer to merit the
renaming churn.

+  },
+
+  /**
    * @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 (this.ignoreExtensions &&
+        controlledBy == chrome.settingsPrivate.ControlledBy.EXTENSION) {
+      return CrPolicyIndicatorType.NONE;
+    }
     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;
   },
 };