| 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 d6bb2c43d74f0db5598b729288cd8aabe44bc89a..7b21a974e9a83a8b25876fc308ec26d8bc41673c 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| +++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| @@ -397,7 +397,7 @@ var SiteSettingsBehaviorImpl = {
|
| * @return {string} The resulting pattern.
|
| * @private
|
| */
|
| - addPatternWildcard_: function(pattern) {
|
| + addPatternWildcard: function(pattern) {
|
| if (pattern.startsWith('http://'))
|
| return pattern.replace('http://', 'http://[*.]');
|
| else if (pattern.startsWith('https://'))
|
| @@ -412,7 +412,7 @@ var SiteSettingsBehaviorImpl = {
|
| * @return {string} The resulting pattern.
|
| * @private
|
| */
|
| - removePatternWildcard_: function(pattern) {
|
| + removePatternWildcard: function(pattern) {
|
| if (pattern.startsWith('http://[*.]'))
|
| return pattern.replace('http://[*.]', 'http://');
|
| else if (pattern.startsWith('https://[*.]'))
|
| @@ -423,6 +423,22 @@ var SiteSettingsBehaviorImpl = {
|
| },
|
|
|
| /**
|
| + * 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.
|
| * @return {string} The background-image style with the favicon.
|
|
|