Extract policy indicator behavior

ui/webui/resources/cr_elements/v1_0/policy/cr_policy_pref_indicator.js

Index: ui/webui/resources/cr_elements/v1_0/policy/cr_policy_pref_indicator.js
diff --git a/ui/webui/resources/cr_elements/v1_0/policy/cr_policy_pref_indicator.js b/ui/webui/resources/cr_elements/v1_0/policy/cr_policy_pref_indicator.js
index ef2d11fbeaa7b257b165889e90b9057e7d6ac20b..1fe7db754a0ac44bce2576b53ba6cde1e428e1a3 100644
--- a/ui/webui/resources/cr_elements/v1_0/policy/cr_policy_pref_indicator.js
+++ b/ui/webui/resources/cr_elements/v1_0/policy/cr_policy_pref_indicator.js
@@ -5,27 +5,14 @@
 /**
  * @fileoverview Polymer element for indicating policies that apply to an
  * element controlling a settings preference.
+ *
+ * @element cr-policy-pref-indicator
  */
-
-var CrPolicyIndicator = {
-  /** @enum {string} */
-  Type: {
-    DEVICE_POLICY: 'devicePolicy',
-    EXTENSION: 'extension',
-    NONE: 'none',
-    OWNER: 'owner',
-    PRIMARY_USER: 'primary_user',
-    RECOMMENDED: 'recommended',
-    USER_POLICY: 'userPolicy',
-  },
-};
-
-(function() {
-
-/** @element cr-policy-pref-indicator */
 Polymer({
   is: 'cr-policy-pref-indicator',
 
+  behaviors: [CrPolicyIndicatorBehavior, CrPolicyPrefBehavior],
+
   properties: {
     /**
      * Optional preference object associated with the indicator. Initialized to
@@ -38,15 +25,16 @@ Polymer({
      * Optional email of the user controlling the setting when the setting does
      * not correspond to a pref (Chrome OS only). Only used when pref is null.
      * Initialized to '' so that computed functions will get called if this is
-     * never set.
+     * never set. TODO(stevenjb/michaelpg): Create a separate indicator for
+     * non-pref (i.e. explicitly set) indicators (see languyage_detail_page).
      */
     controllingUser: {type: String, value: ''},
 
     /**
      * Which indicator type to show (or NONE).
-     * @type {CrPolicyIndicator.Type}
+     * @type {CrPolicyIndicatorType}
      */
-    indicatorType: {type: String, value: CrPolicyIndicator.Type.NONE},
+    indicatorType: {type: String, value: CrPolicyIndicatorType.NONE},
   },
 
   observers: ['prefPolicyChanged_(pref.policySource, pref.policyEnforcement)'],

[Dan Beam, 2015/10/15 04:31:01]

it seems like indicatorType should just be computed, i.e.

  properties: {
    indicatoryType: {
      type: String,
      value: CrPolicyIndicatorType.NONE,
      computed: 'getIndicatorType(pref.policySource, pref.policyEnforcement)',
    },
  },

and drop prefPolicyChanged_ and observers

[stevenjb, 2015/10/15 22:56:22]

Yes, better. Done.

@@ -58,94 +46,22 @@ Polymer({
    * @private
    */
   prefPolicyChanged_: function(source, enforcement) {
-    var type = CrPolicyIndicator.Type.NONE;
-    if (enforcement == chrome.settingsPrivate.PolicyEnforcement.ENFORCED) {
-      if (source == chrome.settingsPrivate.PolicySource.PRIMARY_USER)
-        type = CrPolicyIndicator.Type.PRIMARY_USER;
-      else if (source == chrome.settingsPrivate.PolicySource.OWNER)
-        type = CrPolicyIndicator.Type.OWNER;
-      else if (source == chrome.settingsPrivate.PolicySource.USER_POLICY)
-        type = CrPolicyIndicator.Type.USER_POLICY;
-      else if (source == chrome.settingsPrivate.PolicySource.DEVICE_POLICY)
-        type = CrPolicyIndicator.Type.DEVICE_POLICY;
-      else if (source == chrome.settingsPrivate.PolicySource.EXTENSION)
-        type = CrPolicyIndicator.Type.EXTENSION;
-    } else if (enforcement ==
-               chrome.settingsPrivate.PolicyEnforcement.RECOMMENDED) {
-      type = CrPolicyIndicator.Type.RECOMMENDED;
-    }
-    this.indicatorType = type;
-  },
-
-  /**
-   * @param {CrPolicyIndicator.Type} type
-   * @return {boolean} True if the indicator should be shown.
-   * @private
-   */
-  isIndicatorVisible_: function(type) {
-    return type != CrPolicyIndicator.Type.NONE;
-  },
-
-  /**
-   * @param {CrPolicyIndicator.Type} type
-   * @return {string} The iron-icons icon name.
-   * @private
-   */
-  getIcon_: function(type) {
-    switch (type) {
-      case CrPolicyIndicator.Type.NONE:
-        return '';
-      case CrPolicyIndicator.Type.PRIMARY_USER:
-        return 'social:group';
-      case CrPolicyIndicator.Type.OWNER:
-        return 'social:person';
-      case CrPolicyIndicator.Type.USER_POLICY:
-      case CrPolicyIndicator.Type.DEVICE_POLICY:
-        return 'social:domain';
-      case CrPolicyIndicator.Type.EXTENSION:
-        return 'extension';
-      case CrPolicyIndicator.Type.RECOMMENDED:
-        return 'social:domain';
-    }
-    assertNotReached();
-  },
-
-  /**
-   * @param {string} id The id of the string to translate.
-   * @param {string=} opt_name An optional name argument.
-   * @return The translated string.
-   */
-  i18n_: function (id, opt_name) {
-    return loadTimeData.getStringF(id, opt_name);
+    this.indicatorType = this.getIndicatorType(source, enforcement);
   },
 
   /**
-   * @param {CrPolicyIndicator.Type} type The type of indicator.
+   * @param {CrPolicyIndicatorType} type
    * @param {?chrome.settingsPrivate.PrefObject} pref
-   * @param {string} controllingUser The user controlling the setting, if |pref|
-   *     is null.
    * @return {string} The tooltip text for |type|.
    * @private
    */
-  getTooltipText_: function(type, pref, controllingUser) {
-    var name = pref ? pref.policySourceName : controllingUser;
-
-    switch (type) {
-      case CrPolicyIndicator.Type.PRIMARY_USER:
-        return this.i18n_('controlledSettingShared', name);
-      case CrPolicyIndicator.Type.OWNER:
-        return this.i18n_('controlledSettingOwner', name);
-      case CrPolicyIndicator.Type.USER_POLICY:
-      case CrPolicyIndicator.Type.DEVICE_POLICY:
-        return this.i18n_('controlledSettingPolicy');
-      case CrPolicyIndicator.Type.EXTENSION:
-        return this.i18n_('controlledSettingExtension', name);
-      case CrPolicyIndicator.Type.RECOMMENDED:
-        if (pref && pref.value == pref.recommendedValue)
-          return this.i18n_('controlledSettingRecommendedMatches');
-        return this.i18n_('controlledSettingRecommendedDiffers');
+  getTooltip_: function(type, pref, controllingUser) {
+    if (type == CrPolicyIndicatorType.RECOMMENDED) {
+      if (pref && pref.value == pref.recommendedValue)
+        return this.i18n_('controlledSettingRecommendedMatches');
+      return this.i18n_('controlledSettingRecommendedDiffers');
     }
-    return '';
+    var name = pref ? pref.policySourceName : controllingUser;
+    return this.getPolicyIndicatorTooltip(type, name);
   }
 });
-})();