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

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

Issue 2919853002: [MD settings] site exceptions, use embedding origin rather than embeddingDisplayName (Closed)
Patch Set: review changes Created 3 years, 6 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 3b8f6442e7f60ff929e7bd52ecbfa41f074320fc..de28654b2bd53738f4aa626ff8a7617351552c43 100644
--- a/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
+++ b/chrome/browser/resources/settings/site_settings/site_settings_behavior.js
@@ -94,22 +94,6 @@ var SiteSettingsBehaviorImpl = {
return pattern;
},
- /**
- * Looks up the human-friendly embedder string to show in the UI.
- * @param {string} embeddingOrigin The embedding origin to show.
- * @param {string} category The category requesting it.
- * @return {string} The string to show.
- */
- getEmbedderString: function(embeddingOrigin, category) {
- if (embeddingOrigin == '') {
- if (category != settings.ContentSettingsTypes.GEOLOCATION)
- return '';
- return loadTimeData.getStringF('embeddedOnHost', '*');
- }
- return loadTimeData.getStringF(
- 'embeddedOnHost', this.sanitizePort(embeddingOrigin));
- },
-
/**
* Returns the icon to use for a given site.
* @param {string} site The url of the site to fetch the icon for.
@@ -160,11 +144,6 @@ var SiteSettingsBehaviorImpl = {
expandSiteException: function(exception) {
var origin = exception.origin;
var embeddingOrigin = exception.embeddingOrigin;
- var embeddingDisplayName = '';
- if (origin != embeddingOrigin) {
- embeddingDisplayName =
- this.getEmbedderString(embeddingOrigin, this.category);
- }
var enforcement = '';
if (exception.source == 'extension' || exception.source == 'HostedApp' ||
@@ -179,7 +158,6 @@ var SiteSettingsBehaviorImpl = {
origin: origin,
displayName: exception.displayName,
embeddingOrigin: embeddingOrigin,
- embeddingDisplayName: embeddingDisplayName,
incognito: exception.incognito,
setting: exception.setting,
enforcement: enforcement,

Powered by Google App Engine
This is Rietveld 408576698