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 51b7f3aefd75125a5e8a407b67b9e3e03f699ec4..1f4280ba2d94d2492f473155ff065de2a7ad2826 100644 |
--- a/chrome/browser/resources/settings/site_settings/site_list.js |
+++ b/chrome/browser/resources/settings/site_settings/site_list.js |
@@ -187,23 +187,25 @@ Polymer({ |
* @param {chrome.settingsPrivate.Enforcement} enforcement The level of |
* enforcement. |
* @param {boolean} readOnlyList Whether the site exception list is read-only. |
+ * @param {!SiteException} item The content setting exception. |
dpapad
2017/05/10 21:44:57
Nit: Maybe a more descriptive name would be |excep
dschuyler
2017/05/10 22:05:37
Done.
|
* @return {boolean} |
* @private |
*/ |
- isResetButtonHidden_: function(enforcement, readOnlyList) { |
+ isResetButtonHidden_: function(enforcement, readOnlyList, item) { |
dpapad
2017/05/10 21:44:57
Nit (optional): I think it would improve readabili
dschuyler
2017/05/10 22:05:37
Done.
|
return enforcement == chrome.settingsPrivate.Enforcement.ENFORCED || |
- this.allSites || !readOnlyList; |
+ this.allSites || !(readOnlyList || !!item.embeddingOrigin); |
}, |
/** |
* @param {string} enforcement Whether the exception is controlled. |
* @param {boolean} readOnlyList Whether the site exception list is read-only. |
+ * @param {!SiteException} item The content setting exception. |
* @return {boolean} |
* @private |
*/ |
- isActionMenuHidden_: function(enforcement, readOnlyList) { |
+ isActionMenuHidden_: function(enforcement, readOnlyList, item) { |
return enforcement == chrome.settingsPrivate.Enforcement.ENFORCED || |
- this.allSites || readOnlyList; |
+ this.allSites || readOnlyList || !!item.embeddingOrigin; |
}, |
/** |