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

ui/webui/resources/cr_elements/policy/cr_policy_indicator_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 indicators.
  * TODO(michaelpg): Since extensions can also control settings and be indicated,
  * rework the "policy" naming scheme throughout this directory.
  */
 
 /**
  * Strings required for policy indicators. These must be set at runtime.
  * Chrome OS only strings may be undefined.
  * @type {{
+ *   controlledSettingExtension: string,
  *   controlledSettingPolicy: string,
  *   controlledSettingRecommendedMatches: string,
  *   controlledSettingRecommendedDiffers: string,
  *   controlledSettingShared: (string|undefined),
  *   controlledSettingOwner: (string|undefined),
  * }}
  */
 var CrPolicyStrings;
 
 /** @enum {string} */
@@ skipping 47 matching lines @@
       computed: 'getIndicatorTooltip(indicatorType, indicatorSourceName)',
     },
   },
 
   /**
    * @param {CrPolicyIndicatorType} type
    * @return {boolean} True if the indicator should be shown.
    * @private
    */
   getIndicatorVisible_: function(type) {
-    return type != CrPolicyIndicatorType.NONE &&
-        type != CrPolicyIndicatorType.EXTENSION;
+    return type != CrPolicyIndicatorType.NONE;
   },
 
   /**
    * @param {CrPolicyIndicatorType} type
    * @return {string} The iron-icon icon name.
    * @private
    */
   getIndicatorIcon_: function(type) {
-    var icon = '';
     switch (type) {
       case CrPolicyIndicatorType.EXTENSION:
+        return 'cr:extension';
       case CrPolicyIndicatorType.NONE:
-        return icon;
+        return '';
       case CrPolicyIndicatorType.PRIMARY_USER:
-        icon = 'cr:group';
-        break;
+        return 'cr:group';
       case CrPolicyIndicatorType.OWNER:
-        icon = 'cr:person';
-        break;
+        return 'cr:person';
       case CrPolicyIndicatorType.USER_POLICY:
       case CrPolicyIndicatorType.DEVICE_POLICY:
       case CrPolicyIndicatorType.RECOMMENDED:
-        icon = 'cr20:domain';
-        break;
+        return 'cr20:domain';
       default:
         assertNotReached();
     }
-    return icon;
   },
 
   /**
    * @param {!CrPolicyIndicatorType} type
    * @param {string} name The name associated with the indicator. See
    *     chrome.settingsPrivate.PrefObject.controlledByName
    * @param {boolean=} opt_matches For RECOMMENDED only, whether the indicator
    *     value matches the recommended value.
    * @return {string} The tooltip text for |type|.
    */
   getIndicatorTooltip: function(type, name, opt_matches) {
     if (!CrPolicyStrings)
       return '';  // Tooltips may not be defined, e.g. in OOBE.
     switch (type) {
+      case CrPolicyIndicatorType.EXTENSION:
+        return CrPolicyStrings.controlledSettingExtension;
       case CrPolicyIndicatorType.PRIMARY_USER:
         return CrPolicyStrings.controlledSettingShared.replace('$1', name);
       case CrPolicyIndicatorType.OWNER:
         return CrPolicyStrings.controlledSettingOwner.replace('$1', name);
       case CrPolicyIndicatorType.USER_POLICY:
       case CrPolicyIndicatorType.DEVICE_POLICY:
         return CrPolicyStrings.controlledSettingPolicy;
       case CrPolicyIndicatorType.RECOMMENDED:
         return opt_matches ?
             CrPolicyStrings.controlledSettingRecommendedMatches :
             CrPolicyStrings.controlledSettingRecommendedDiffers;
     }
     return '';
   },
 };