chrome/browser/resources/settings/site_settings/site_list.js - Issue 2269963003: Site Settings Desktop: Fix bug with deleting manually added exceptions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2269963003: Site Settings Desktop: Fix bug with deleting manually added exceptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test Created 4 years, 4 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

« chrome/browser/resources/settings/site_settings/site_details_permission.js ('K') | « chrome/browser/resources/settings/site_settings/site_details_permission.js ('k') | chrome/browser/resources/settings/site_settings/site_settings_behavior.js » ('j') | content/public/test/test_web_ui.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/site_settings/site_list.js

diff --git a/chrome/browser/resources/settings/site_settings/site_list.js b/chrome/browser/resources/settings/site_settings/site_list.js

index 0796afdb17b488e22bb236034498a14dadabf193..18cb1d83604e0f0400fcf8b20e1c61f463bc2b0d 100644

--- a/chrome/browser/resources/settings/site_settings/site_list.js

+++ b/chrome/browser/resources/settings/site_settings/site_list.js

@@ -349,14 +349,10 @@ Polymer({

var originForDisplay = this.sanitizePort(origin.replace('[*.]', ''));

var embeddingOrigin = sites[i].embeddingOrigin;

- if (this.category == settings.ContentSettingsTypes.GEOLOCATION) {

- if (embeddingOrigin == '')

- embeddingOrigin = '*';

- }

var embeddingOriginForDisplay = '';

- if (embeddingOrigin != '' && origin != embeddingOrigin) {

- embeddingOriginForDisplay = loadTimeData.getStringF(

- 'embeddedOnHost', this.sanitizePort(embeddingOrigin));

+ if (origin != embeddingOrigin) {

+ embeddingOriginForDisplay =

+ this.getEmbedderString(embeddingOrigin, this.category);

}

// The All Sites category can contain duplicates (from other categories).