| 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 f1a9dcbec66bfc34e58b7932d7a760f9d6e04ebd..3e7751147fa83cd1e904f7af8c9908b5c16b1461 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| +++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
|
| @@ -381,6 +381,8 @@ var SiteSettingsBehaviorImpl = {
|
| return pattern.replace('http://', 'http://[*.]');
|
| else if (pattern.startsWith('https://'))
|
| return pattern.replace('https://', 'https://[*.]');
|
| + else if (pattern.startsWith('chrome-extension://'))
|
| + return pattern; // No need for a wildcard for this.
|
| else
|
| return '[*.]' + pattern;
|
| },
|
| @@ -481,7 +483,8 @@ var SiteSettingsBehaviorImpl = {
|
| */
|
| expandSiteException: function(exception) {
|
| var origin = exception.origin;
|
| - var originForDisplay = this.sanitizePort(this.toUrl(origin).origin);
|
| + var url = this.toUrl(origin);
|
| + var originForDisplay = url ? this.sanitizePort(url.origin) : origin;
|
|
|
| var embeddingOrigin = exception.embeddingOrigin;
|
| var embeddingOriginForDisplay = '';
|
|
|