chrome/browser/resources/settings/site_settings/site_settings_behavior.js - Issue 2525943002: Display content settings for extensions with extension name.

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_settings_behavior.js

Issue 2525943002: Display content settings for extensions with extension name. (Closed)

Patch Set: fix missing . 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

« chrome/browser/resources/settings/site_settings/site_list.html ('K') | « chrome/browser/resources/settings/site_settings/site_list.html ('k') | chrome/browser/resources/settings/site_settings/zoom_levels.html » ('j') | chrome/browser/resources/settings/site_settings/zoom_levels.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 b86fa23f2c9004ef4646e09cd69181a019c4b481..822b55ec514386fd8746ecaf5096e011e8e58dcf 100644

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

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

@@ -440,10 +440,14 @@ var SiteSettingsBehaviorImpl = {

embeddingOriginForDisplay =

this.getEmbedderString(embeddingOrigin, this.category);

}

+ var originForDisplay = origin;

+ if (exception.displayName) {

+ originForDisplay = exception.displayName;

+ }

return {

origin: origin,

- originForDisplay: origin,

+ originForDisplay: originForDisplay,

embeddingOrigin: embeddingOrigin,

embeddingOriginForDisplay: embeddingOriginForDisplay,

incognito: exception.incognito,