Change Blocked list header to Muted for sound content setting

Bug: 743001
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Id07bbc5a0afe968ca448a0b32855d104b7322211
Reviewed-on: https://chromium-review.googlesource.com/688818Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505235}

chrome/app/settings_strings.grdp

@@ -2435,6 +2435,9 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_BLOCK" desc="Label for add block sites in site settings.">
     Block
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_BLOCK_SOUND" desc="Label for add muted sites in site settings.">
+    Muted
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_SESSION_ONLY" desc="Label for sites in site settings allowing cookies for the current session only.">
     Clear on exit
   </message>

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

@@ -219,7 +219,8 @@
               category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
+              category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}"
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -232,7 +233,8 @@
               category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
+              category="{{ContentSettingsTypes.BACKGROUND_SYNC}}"
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -246,7 +248,8 @@
                   "$i18n{siteSettingsAskBeforeAccessingRecommended}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.CAMERA}}" read-only-list>
+              category="{{ContentSettingsTypes.CAMERA}}" read-only-list
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -271,7 +274,8 @@
              </button>
           </div>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.COOKIES}}">
+              category="{{ContentSettingsTypes.COOKIES}}"
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -291,7 +295,8 @@
               toggle-on-label="$i18n{siteSettingsShowAllRecommended}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.IMAGES}}">
+              category="{{ContentSettingsTypes.IMAGES}}"
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -303,7 +308,8 @@
               category="{{ContentSettingsTypes.GEOLOCATION}}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.GEOLOCATION}}" read-only-list>
+              category="{{ContentSettingsTypes.GEOLOCATION}}" read-only-list
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -333,7 +339,8 @@
               category="{{ContentSettingsTypes.JAVASCRIPT}}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.JAVASCRIPT}}">
+              category="{{ContentSettingsTypes.JAVASCRIPT}}"
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -347,7 +354,8 @@
                 category="{{ContentSettingsTypes.SOUND}}">
             </category-default-setting>
             <category-setting-exceptions
-                category="{{ContentSettingsTypes.SOUND}}">
+                category="{{ContentSettingsTypes.SOUND}}"
+                block-header="$i18n{siteSettingsBlockSound}">
             </category-setting-exceptions>
           </settings-subpage>
        </template>
@@ -362,7 +370,8 @@
                   "$i18n{siteSettingsAskBeforeAccessingRecommended}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.MIC}}" read-only-list>
+              category="{{ContentSettingsTypes.MIC}}" read-only-list
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -374,7 +383,8 @@
               category="{{ContentSettingsTypes.NOTIFICATIONS}}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.NOTIFICATIONS}}">
+              category="{{ContentSettingsTypes.NOTIFICATIONS}}"
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -394,7 +404,8 @@
           </a>
 </if>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.PLUGINS}}">
+              category="{{ContentSettingsTypes.PLUGINS}}"
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -405,7 +416,8 @@
               toggle-on-label="$i18n{siteSettingsAllowed}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.POPUPS}}">
+              category="{{ContentSettingsTypes.POPUPS}}"
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -420,7 +432,8 @@
             </category-default-setting>
             <category-setting-exceptions
                 category="{{ContentSettingsTypes.ADS}}"
-                read-only-list>
+                read-only-list
+                block-header="$i18n{siteSettingsBlock}">
             </category-setting-exceptions>
           </settings-subpage>
        </template>
@@ -434,7 +447,8 @@
               category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
+              category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -447,7 +461,8 @@
               category="{{ContentSettingsTypes.MIDI_DEVICES}}">
           </category-default-setting>
           <category-setting-exceptions
-              category="{{ContentSettingsTypes.MIDI_DEVICES}}" read-only-list>
+              category="{{ContentSettingsTypes.MIDI_DEVICES}}" read-only-list
+              block-header="$i18n{siteSettingsBlock}">
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -494,7 +509,8 @@
           <template is="dom-if"
               if="[[prefs.settings.privacy.drm_enabled.value]]">
             <category-setting-exceptions
-                category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
+                category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"
+                block-header="$i18n{siteSettingsBlock}">
             </category-setting-exceptions>
           </template>
 </if>

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

@@ -18,7 +18,7 @@
     <site-list
         category="[[category]]"
         category-subtype="[[ContentSetting.BLOCK]]"
-        category-header="$i18n{siteSettingsBlock}"
+        category-header="[[blockHeader]]"
         read-only-list="[[readOnlyList]]">
     </site-list>
     <site-list

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

@@ -20,6 +20,11 @@ Polymer({
       type: Boolean,
       value: false,
     },
+
+    /**
+     * The heading text for the blocked exception list.
+     */
+    blockHeader: String,
   },
 
   /** @override */

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -1865,6 +1865,7 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
      IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW_SITES_RECOMMENDED},
     {"siteSettingsAllow", IDS_SETTINGS_SITE_SETTINGS_ALLOW},
     {"siteSettingsBlock", IDS_SETTINGS_SITE_SETTINGS_BLOCK},
+    {"siteSettingsBlockSound", IDS_SETTINGS_SITE_SETTINGS_BLOCK_SOUND},
     {"siteSettingsSessionOnly", IDS_SETTINGS_SITE_SETTINGS_SESSION_ONLY},
     {"siteSettingsAllowed", IDS_SETTINGS_SITE_SETTINGS_ALLOWED},
     {"siteSettingsAllowedRecommended",