Site Settings: Use only string values for permissions on the JS side.

chrome/browser/resources/settings/site_settings/site_list.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
  * 'settings-site-list' shows a list of Allowed and Blocked sites for a given
  * category.
  */
 Polymer({
@@ skipping 32 matching lines @@
     /**
      * Whether this list is for the All Sites category.
      */
     allSites: {
       type: Boolean,
       value: false,
     },
 
     /**
       * The type of category this widget is displaying data for. Normally
-      * either ALLOW or BLOCK, representing which sites are allowed or blocked
-      * respectively.
+      * either 'allow' or 'block', representing which sites are allowed or
+      * blocked respectively.
       */
     categorySubtype: {
-      type: Number,
+      type: String,
       value: settings.INVALID_CATEGORY_SUBTYPE,
     },
 
     /**
      * Represents the state of the main toggle shown for the category. For
      * example, the Location category can be set to Block/Ask so false, in that
      * case, represents Block and true represents Ask.
      */
     categoryEnabled: {
       type: Boolean,
@@ skipping 85 matching lines @@
       this.$.category.opened = true;
       return;
     }
 
     // Block list should only be shown opened if there is nothing to show in
     // the allowed list.
     if (this.category != settings.INVALID_CATEGORY_SUBTYPE) {
       this.browserProxy_.getExceptionList(this.category).then(
         function(exceptionList) {
           var allowExists = exceptionList.some(function(exception) {
-            return exception.setting == settings.PermissionStringValues.ALLOW;
+            return exception.setting == settings.PermissionValues.ALLOW;
           });
           if (allowExists)
             return;
           this.$.category.opened = true;
       }.bind(this));
     } else {
       this.$.category.opened = true;
     }
   },
 
@@ skipping 69 matching lines @@
    * Appends to |list| the sites for a given category and subtype.
    * @param {!Array<SiteException>} sites The site list to add to.
    * @param {!Array<SiteException>} exceptionList List of sites (exceptions) to
    *     add.
    * @return {!Array<SiteException>} The list of sites.
    * @private
    */
   appendSiteList_: function(sites, exceptionList) {
     for (var i = 0; i < exceptionList.length; ++i) {
       if (this.category != settings.ALL_SITES) {
+        if (exceptionList[i].setting == settings.PermissionValues.DEFAULT)
+          continue;
+
         // Filter out 'Block' values if this list is handling 'Allow' items.
-        if (exceptionList[i].setting == settings.PermissionStringValues.BLOCK &&
+        if (exceptionList[i].setting == settings.PermissionValues.BLOCK &&
             this.categorySubtype != settings.PermissionValues.BLOCK) {
           continue;
         }
         // Filter out 'Allow' values if this list is handling 'Block' items.
-        if (exceptionList[i].setting == settings.PermissionStringValues.ALLOW &&
+        if (exceptionList[i].setting == settings.PermissionValues.ALLOW &&
             this.categorySubtype != settings.PermissionValues.ALLOW) {
           continue;
         }
       }
 
       sites.push(exceptionList[i]);
     }
     return sites;
   },
 
@@ skipping 39 matching lines @@
           }
         }
       }
       return comparison;
     });
     var results = [];
     var lastOrigin = '';
     var lastEmbeddingOrigin = '';
     for (var i = 0; i < sites.length; ++i) {
       var origin = sites[i].origin;
+      var originForDisplay = origin.replace('[*.]', '');
+
       var embeddingOrigin = sites[i].embeddingOrigin;
-
-      var originForDisplay = origin.replace('[*.]', '');
+      if (this.category == settings.ContentSettingsTypes.GEOLOCATION) {
+        if (embeddingOrigin == '')
+          embeddingOrigin = '*';
+      }
       var embeddingOriginForDisplay = '';
-      if (embeddingOrigin != '*' && origin != embeddingOrigin)
-        embeddingOriginForDisplay = embeddingOrigin;
+      if (embeddingOrigin != '' && origin != embeddingOrigin) {
+        embeddingOriginForDisplay =
+            loadTimeData.getStringF('embeddedOnHost', embeddingOrigin);
+      }
 
       // The All Sites category can contain duplicates (from other categories).
       if (originForDisplay == lastOrigin &&
           embeddingOriginForDisplay == lastEmbeddingOrigin) {
         continue;
       }
 
       results.push({
          origin: origin,
          originForDisplay: originForDisplay,
@@ skipping 47 matching lines @@
     var embeddingOrigin = event.model.item.embeddingOrigin;
     var action = event.detail.item.textContent;
     if (action == this.i18n_.resetAction) {
       this.resetCategoryPermissionForOrigin(
           origin, embeddingOrigin, this.category);
     } else {
       var value = (action == this.i18n_.allowAction) ?
           settings.PermissionValues.ALLOW :
           settings.PermissionValues.BLOCK;
       this.setCategoryPermissionForOrigin(
-          origin, embeddingOrigin, value, this.category);
+          origin, embeddingOrigin, this.category, value);
     }
   },
 
   /**
    * Returns the appropriate header value for display.
    * @param {Array<string>} siteList The list of all sites to display for this
    *     category subtype.
    * @param {boolean} toggleState The state of the global toggle for this
    *     category.
    * @private
@@ skipping 45 matching lines @@
    * Returns the icon to use for a given site.
    * @param {string} url The url of the site to fetch the icon for.
    * @private
    */
   computeSiteIcon_: function(url) {
     // TODO(finnur): For now, we're returning a placeholder image for each site
     // but the actual favicon for each site will need to be returned.
     return 'communication:message';
   },
 });