1 files changed, 35 insertions, 16 deletions
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_list_entry.js b/chromium/chrome/browser/resources/settings/site_settings/site_list_entry.js
index fda7071af91..b296f31a34a 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_list_entry.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_list_entry.js
@@ -55,12 +55,6 @@ Polymer({
     },
 
     /** @private */
-    siteDescription_: {
-      type: String,
-      computed: 'computeSiteDescription_(model)',
-    },
-
-    /** @private */
     showPolicyPrefIndicator_: {
       type: Boolean,
       computed: 'computeShowPolicyPrefIndicator_(model)',
@@ -126,34 +120,59 @@ Polymer({
   },
 
   /**
+   * Returns the appropriate display name to show for the exception.
+   * This can, for example, be the website that is affected itself,
+   * or the website whose third parties are also affected.
+   * @return {string}
+   */
+  computeDisplayName_: function() {
+    if (this.model.embeddingOrigin &&
+        this.model.category === settings.ContentSettingsTypes.COOKIES &&
+        this.model.origin.trim() == settings.SITE_EXCEPTION_WILDCARD) {
+      return this.model.embeddingOrigin;
+    }
+    return this.model.displayName;
+  },
+
+  /**
    * Returns the appropriate site description to display. This can, for example,
    * be blank, an 'embedded on <site>' or 'Current incognito session' (or a
    * mix of the last two).
-   * @return {string} The site description.
+   * @return {string}
    */
   computeSiteDescription_: function() {
-    let displayName = '';
+    let description = '';
+
     if (this.model.embeddingOrigin) {
-      displayName = loadTimeData.getStringF(
-          'embeddedOnHost', this.sanitizePort(this.model.embeddingOrigin));
+      if (this.model.category === settings.ContentSettingsTypes.COOKIES &&
+          this.model.origin.trim() == settings.SITE_EXCEPTION_WILDCARD) {
+        description =
+            loadTimeData.getString(
+                'siteSettingsCookiesThirdPartyExceptionLabel');
+       } else {
+         description = loadTimeData.getStringF(
+             'embeddedOnHost', this.sanitizePort(this.model.embeddingOrigin));
+       }
     } else if (this.category == settings.ContentSettingsTypes.GEOLOCATION) {
-      displayName = loadTimeData.getString('embeddedOnAnyHost');
+      description = loadTimeData.getString('embeddedOnAnyHost');
     }
 
     // <if expr="chromeos">
     if (this.model.category === settings.ContentSettingsTypes.NOTIFICATIONS &&
         this.model.showAndroidSmsNote) {
-      displayName = loadTimeData.getString('androidSmsNote');
+      description = loadTimeData.getString('androidSmsNote');
     }
     // </if>
 
     if (this.model.incognito) {
-      if (displayName.length > 0) {
-        return loadTimeData.getStringF('embeddedIncognitoSite', displayName);
+      if (description.length > 0) {
+        description =
+            loadTimeData.getStringF('embeddedIncognitoSite', description);
+      } else {
+        description = loadTimeData.getString('incognitoSite');
       }
-      return loadTimeData.getString('incognitoSite');
     }
-    return displayName;
+    return description;
   },
 
   /**