| Index: chrome/browser/resources/settings/site_settings/site_list.js
|
| diff --git a/chrome/browser/resources/settings/site_settings/site_list.js b/chrome/browser/resources/settings/site_settings/site_list.js
|
| index 48477655e47d0f3bb6c8f80302a65fe8194547e2..d121b5bedbfc14756f56fe83496114658963596f 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_list.js
|
| +++ b/chrome/browser/resources/settings/site_settings/site_list.js
|
| @@ -353,14 +353,14 @@ Polymer({
|
| var siteException = this.expandSiteException(sites[i]);
|
|
|
| // The All Sites category can contain duplicates (from other categories).
|
| - if (this.allSites && siteException.originForDisplay == lastOrigin &&
|
| - siteException.embeddingOriginForDisplay == lastEmbeddingOrigin) {
|
| + if (this.allSites && siteException.origin == lastOrigin &&
|
| + siteException.embeddingOrigin == lastEmbeddingOrigin) {
|
| continue;
|
| }
|
|
|
| results.push(siteException);
|
| - lastOrigin = siteException.originForDisplay;
|
| - lastEmbeddingOrigin = siteException.embeddingOriginForDisplay;
|
| + lastOrigin = siteException.origin;
|
| + lastEmbeddingOrigin = siteException.embeddingOrigin;
|
| }
|
| return results;
|
| },
|
| @@ -458,14 +458,14 @@ Polymer({
|
| * @return {string} The site description.
|
| */
|
| computeSiteDescription_: function(item) {
|
| - if (item.incognito && item.embeddingOriginForDisplay.length > 0) {
|
| + if (item.incognito && item.embeddingDisplayName.length > 0) {
|
| return loadTimeData.getStringF('embeddedIncognitoSite',
|
| - item.embeddingOriginForDisplay);
|
| + item.embeddingDisplayName);
|
| }
|
|
|
| if (item.incognito)
|
| return loadTimeData.getString('incognitoSite');
|
| - return item.embeddingOriginForDisplay;
|
| + return item.embeddingDisplayName;
|
| },
|
|
|
| /**
|
|
|