| 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 318bbd5f2d69a065d3562140780fd403881ddcd7..bf6f2ac68ab2d8becf704103b807f411480e4b25 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| +++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| @@ -95,22 +95,6 @@ var SiteSettingsBehaviorImpl = {
|
| return pattern;
|
| },
|
|
|
| - /**
|
| - * Looks up the human-friendly embedder string to show in the UI.
|
| - * @param {string} embeddingOrigin The embedding origin to show.
|
| - * @param {string} category The category requesting it.
|
| - * @return {string} The string to show.
|
| - */
|
| - getEmbedderString: function(embeddingOrigin, category) {
|
| - if (embeddingOrigin == '') {
|
| - if (category != settings.ContentSettingsTypes.GEOLOCATION)
|
| - return '';
|
| - return loadTimeData.getStringF('embeddedOnHost', '*');
|
| - }
|
| - return loadTimeData.getStringF(
|
| - 'embeddedOnHost', this.sanitizePort(embeddingOrigin));
|
| - },
|
| -
|
| /**
|
| * Returns the icon to use for a given site.
|
| * @param {string} site The url of the site to fetch the icon for.
|
| @@ -161,11 +145,6 @@ var SiteSettingsBehaviorImpl = {
|
| expandSiteException: function(exception) {
|
| var origin = exception.origin;
|
| var embeddingOrigin = exception.embeddingOrigin;
|
| - var embeddingDisplayName = '';
|
| - if (origin != embeddingOrigin) {
|
| - embeddingDisplayName =
|
| - this.getEmbedderString(embeddingOrigin, this.category);
|
| - }
|
|
|
| var enforcement = '';
|
| if (exception.source == 'extension' || exception.source == 'HostedApp' ||
|
| @@ -180,7 +159,6 @@ var SiteSettingsBehaviorImpl = {
|
| origin: origin,
|
| displayName: exception.displayName,
|
| embeddingOrigin: embeddingOrigin,
|
| - embeddingDisplayName: embeddingDisplayName,
|
| incognito: exception.incognito,
|
| setting: exception.setting,
|
| enforcement: enforcement,
|
|
|