Site Settings Desktop: Flesh out controlled exceptions a little more.

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
  * 'site-list' shows a list of Allowed and Blocked sites for a given
  * category.
  */
 Polymer({
@@ skipping 168 matching lines @@
           if (othersExists)
             return;
           this.$.category.opened = true;
       }.bind(this));
     } else {
       this.$.category.opened = true;
     }
   },
 
   /**
-   * @param {string} source Where the setting came from.
-   * @return {boolean}
-   * @private
+   * Returns which icon, if any, should represent the fact that this exception
+   * is controlled.
+   * @param {!SiteException} item The item from the list we're computing the
+   *    icon for.
+   * @return {string} The icon to show (or blank, if none).
    */
-  isPolicyControlled_: function(source) {
-    return source == 'policy';
+  computeIconControlledBy_: function(item) {
+    if (item.source == 'extension')
+      return 'cr:extension';
+    if (item.source == 'HostedApp')
+      return 'cr:extension';
+    if (item.source == 'platform_app')
+      return 'cr:extension';
+    if (item.source == 'policy')
+      return 'cr:domain';
+    return '';

[dschuyler, 2016/09/21 17:25:20]

optional: A handful of conditionals is not a big deal,
so this may be fine as is, but around this point I'd 
suggest switching to a dictionary (object) and doing
something like:

iconControlledBy: {
...
},
computeIconControlledBy_: function(item) {
  return iconControlledBy[item.source] || '';
},

[Finnur, 2016/09/22 12:58:00]

Done.

   },
 
   /**
    * @param {string} source Where the setting came from.
    * @return {boolean}
    * @private
    */
   shouldShowMenu_: function(source) {
-    return !(this.isPolicyControlled_(source) || this.allSites);
+    return !(this.isExceptionControlled_(source) || this.allSites);
   },
 
   /**
    * Makes sure the visibility is correct for this widget.
    * @private
    */
   updateCategoryVisibility_: function() {
     this.$.category.hidden =
         !this.showSiteList_(this.sites, this.categoryEnabled);
   },
@@ skipping 182 matching lines @@
 
     return this.showSessionOnlyAction_;
   },
 
   /**
    * A handler for selecting a site (by clicking on the origin).
    * @private
    */
   onOriginTap_: function(event) {
     this.selectedSite = event.model.item;
-    if (this.isPolicyControlled_(this.selectedSite.source))
-      return;

[Finnur, 2016/09/21 16:45:24]

I took this out because it doesn't make sense to me to block the Site Details
page just because the exception one clicked on is controlled. If an admin blocks
plugins on youtube.com and the user has a popup exception, the user would expect
to get to the details page, see that she can't change the plugins exception but
is still able to control the popup exception.

[dschuyler, 2016/09/21 17:25:20]

Acknowledged.

-
     settings.navigateTo(settings.Route.SITE_SETTINGS_SITE_DETAILS,
         new URLSearchParams('site=' + this.selectedSite.origin));
   },
 
   /**
    * A handler for activating one of the menu action items.
    * @param {!{model: !{item: !{origin: string}},
    *           detail: !{selected: string}}} event
    * @private
    */
@@ skipping 81 matching lines @@
     // is redundant to also list all the sites that are blocked.
     if (this.isAllowList_())
       return true;
 
     if (this.isSessionOnlyList_())
       return siteList.length > 0;
 
     return toggleState;
   },
 });