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

chrome/browser/resources/settings/site_settings/site_list.html

 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submenu.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu-button/paper-menu-button.html">
 <link rel="import" href="/i18n_setup.html">
@@ skipping 25 matching lines @@
         <div class="flex" id="header">
           [[computeSiteListHeader_(sites, categoryEnabled)]]
         </div>
         <iron-icon id="icon" icon="cr:expand-more"></iron-icon>
       </div>
 
       <div class="list-frame menu-content vertical-list" id="listContainer">
         <template is="dom-repeat" items="[[sites]]">
           <div class="list-item">
             <div class="start layout horizontal center" on-tap="onOriginTap_"
-                actionable$="[[!isPolicyControlled_(item.source)]]">
+                actionable$="[[!isExceptionControlled_(item.source)]]">
               <div class="favicon-image"
                   style$="[[computeSiteIcon(item.originForDisplay)]]">
               </div>
               <div class="middle">
                 <div class="selectable">[[item.originForDisplay]]</div>
                 <div class="selectable secondary">
                   [[computeSiteDescription_(item)]]
                 </div>
               </div>
             </div>
 
-            <template is="dom-if" if="[[isPolicyControlled_(item.source)]]">
-              <iron-icon icon="cr:domain"></iron-icon>
+            <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]">
+              <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon>
             </template>
-            <paper-menu-button hidden="[[!shouldShowMenu_(item.source)]]"
+
+            <paper-menu-button hidden="[[isExceptionControlled_(item.source)]]"
                 horizontal-align="right">
               <paper-icon-button icon="cr:more-vert" class="dropdown-trigger">
               </paper-icon-button>
               <paper-menu id="actionMenu" class="dropdown-content"
                   on-iron-activate="onActionMenuIronActivate_"
                   attr-for-selected="menu-value">
                 <paper-item
                     hidden="[[!showAllowAction_]]"
                     menu-value$="[[PermissionValues.ALLOW]]">
                   $i18n{siteSettingsActionAllow}
@@ skipping 20 matching lines @@
         <template is="dom-if" if="[[!allSites]]">
           <div class="list-item list-button" on-tap="onAddSiteTap_">
             $i18n{addSiteLink}
           </div>
         </template>
       </div>
     </paper-submenu>
   </template>
   <script src="site_list.js"></script>
 </dom-module>