Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Unified Diff: chrome/browser/resources/settings/site_settings/site_settings_behavior.js

Issue 2381583002: Site Settings Desktop: Better support for chrome-extension scheme. (Closed)
Patch Set: Add test Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 = '';
« no previous file with comments | « no previous file | chrome/test/data/webui/settings/site_list_tests.js » ('j') | chrome/test/data/webui/settings/site_list_tests.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698