| Index: chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| diff --git a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| index 9aefbb26aae8d59ae85622f69c01fe499c0c7913..2a38a6a2d0f2bcc5bb4a7e81b5cfd6a5e83579ed 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| +++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| @@ -289,23 +289,18 @@ var SiteSettingsBehaviorImpl = {
|
| */
|
| expandSiteException: function(exception) {
|
| var origin = exception.origin;
|
| - // TODO(dschuyler): If orginForDisplay becomes different from origin in the
|
| - // site settings, that filtering would happen here. If that doesn't happen
|
| - // then originForDisplay should be removed (it's redundant with origin).
|
| - // e.g. var originForDisplay = someFilter(origin);
|
| -
|
| var embeddingOrigin = exception.embeddingOrigin;
|
| - var embeddingOriginForDisplay = '';
|
| + var embeddingDisplayName = '';
|
| if (origin != embeddingOrigin) {
|
| - embeddingOriginForDisplay =
|
| + embeddingDisplayName =
|
| this.getEmbedderString(embeddingOrigin, this.category);
|
| }
|
|
|
| return {
|
| origin: origin,
|
| - originForDisplay: origin,
|
| + displayName: exception.displayName,
|
| embeddingOrigin: embeddingOrigin,
|
| - embeddingOriginForDisplay: embeddingOriginForDisplay,
|
| + embeddingDisplayName: embeddingDisplayName,
|
| incognito: exception.incognito,
|
| setting: exception.setting,
|
| source: exception.source,
|
|
|