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

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

Issue 2494943003: [MD settings] show full origin in content settings exceptions (Closed)
Patch Set: unit test fix Created 4 years, 1 month 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
« no previous file with comments | « no previous file | chrome/test/data/webui/settings/site_list_tests.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bd0b1ca0488bfda9edfe70df70cb118e0b123865..ee429ab8e8fbd85e8d2dd682472d9bcdd36dc2a2 100644
--- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
+++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
@@ -437,8 +437,10 @@ var SiteSettingsBehaviorImpl = {
*/
expandSiteException: function(exception) {
var origin = exception.origin;
- var url = this.toUrl(origin);
- var originForDisplay = url ? this.sanitizePort(url.origin) : 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 = '';
@@ -449,7 +451,7 @@ var SiteSettingsBehaviorImpl = {
return {
origin: origin,
- originForDisplay: originForDisplay,
+ originForDisplay: origin,
embeddingOrigin: embeddingOrigin,
embeddingOriginForDisplay: embeddingOriginForDisplay,
incognito: exception.incognito,
« no previous file with comments | « no previous file | chrome/test/data/webui/settings/site_list_tests.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698