Code clean-up/follow-up on Displaying discarded wildcard patterns in settings

This CL addresses the comments that were made on the following CL
https://chromium-review.googlesource.com/c/chromium/src/+/2232370

Bug: 1073883
Change-Id: I2b3f0faed4920888b42b9ed0f992f54e11892fb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2275443
Commit-Queue: Ravjit Singh Uppal <ravjit@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784469}

chrome/browser/resources/settings/privacy_page/privacy_page.html

@@ -449,17 +449,17 @@
         <settings-subpage page-title="$i18n{siteSettingsFlash}"
             search-label="$i18n{siteSettingsAllSitesSearch}"
             search-term="{{searchFilter_}}">
-          <div class="cr-row first no-outline" tabindex="-1">
+          <div class="cr-row first no-outline">
             $i18n{siteSettingsFlashPermissionsEphemeral}
           </div>
           <category-default-setting category="{{ContentSettingsTypes.PLUGINS}}"
               toggle-off-label="$i18n{siteSettingsFlashBlockRecommended}"
               toggle-on-label="$i18n{siteSettingsFlashAskFirst}">
           </category-default-setting>
-            <div class="cr-row-gap cr-secondary-text"
-                 hidden="[[!pluginsHasDiscardedExceptions_]]">
-                $i18nRaw{siteSettingsFlashWildcardsUnsupported}
-            </div>
+          <div class="cr-row-gap cr-secondary-text"
+              hidden="[[!pluginsHasDiscardedExceptions_]]">
+            $i18nRaw{siteSettingsFlashWildcardsUnsupported}
+          </div>
 <if expr="chromeos">
           <a class="cr-row inherit-color no-outline" tabindex="-1"
               target="_blank"

chrome/browser/resources/settings/site_settings/category_setting_exceptions.js

@@ -72,22 +72,18 @@ Polymer({
     },
 
     /**
-     * Boolean which tells if the block list has any discarded content setting
+     * Whether the block list has any discarded content setting
      * pattern.
      * @private
      */
-    blockSiteListHasDiscardedExceptions_: {
-      type: Boolean,
-    },
+    blockSiteListHasDiscardedExceptions_: Boolean,
 
     /**
-     * Boolean which tells if the allow list has any discarded content setting
+     * Whether the allow list has any discarded content setting
      * pattern.
      * @private
      */
-    allowSiteListHasDiscardedExceptions_: {
-      type: Boolean,
-    },
+    allowSiteListHasDiscardedExceptions_: Boolean,
 
     /**
      * Boolean which keeps a track if any of the displayed lists has discarded

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

@@ -536,6 +536,6 @@ Polymer({
    * @private
    */
   computeHasDiscardedExceptions_() {
-    return !!this.sites.find(exception => exception.isDiscarded);
+    return this.sites.some(exception => exception.isDiscarded);
   },
 });

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

@@ -7,7 +7,7 @@
         flex: 1
       }
 
-      .discarded-settings-row {
+      .settings-row.discarded {
         text-decoration: line-through;
       }
 
@@ -17,7 +17,7 @@
       }
     </style>
     <div class="list-item" focus-row-container>
-      <div class$="settings-row [[getClassForSiteListEntry_(model)]]"
+      <div class$="settings-row [[getClassForSiteListEntry_(model.isDiscarded)]]"
           actionable$="[[allowNavigateToSiteDetail_]]" on-click="onOriginTap_">
         <site-favicon url="[[model.origin]]"></site-favicon>
         <div class="middle no-min-width">

chrome/browser/resources/settings/site_settings/site_list_entry.js

@@ -255,13 +255,14 @@ Polymer({
 
   /**
    * Returns the appropriate class name for styling purposes. It could be empty
-   * or 'discarded-settings-row' for discarded content setting patterns.
+   * or 'discarded' for discarded content setting patterns.
    * Patterns like `*://*.google.com:443/* are no longer supported for Plugin
    * content settings.
+   * @param {boolean} isDiscarded Whether the exception is discarded
    * @return {string}
    * @private
    */
-  getClassForSiteListEntry_() {
-    return this.model.isDiscarded ? 'discarded-settings-row' : '';
+  getClassForSiteListEntry_(isDiscarded) {
+    return isDiscarded ? 'discarded' : '';
   }
 });