| 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..2ff2e966c092ad81322818a9d90e567ceabffabc 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_list.js
|
| +++ b/chrome/browser/resources/settings/site_settings/site_list.js
|
| @@ -184,26 +184,27 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @param {chrome.settingsPrivate.Enforcement} enforcement The level of
|
| - * enforcement.
|
| + * @param {!SiteException} exception The content setting exception.
|
| * @param {boolean} readOnlyList Whether the site exception list is read-only.
|
| * @return {boolean}
|
| * @private
|
| */
|
| - isResetButtonHidden_: function(enforcement, readOnlyList) {
|
| - return enforcement == chrome.settingsPrivate.Enforcement.ENFORCED ||
|
| - this.allSites || !readOnlyList;
|
| + shouldHideResetButton_: function(exception, readOnlyList) {
|
| + return exception.enforcement ==
|
| + chrome.settingsPrivate.Enforcement.ENFORCED ||
|
| + this.allSites || !(readOnlyList || !!exception.embeddingOrigin);
|
| },
|
|
|
| /**
|
| - * @param {string} enforcement Whether the exception is controlled.
|
| + * @param {!SiteException} exception The content setting exception.
|
| * @param {boolean} readOnlyList Whether the site exception list is read-only.
|
| * @return {boolean}
|
| * @private
|
| */
|
| - isActionMenuHidden_: function(enforcement, readOnlyList) {
|
| - return enforcement == chrome.settingsPrivate.Enforcement.ENFORCED ||
|
| - this.allSites || readOnlyList;
|
| + shouldHideActionMenu_: function(exception, readOnlyList) {
|
| + return exception.enforcement ==
|
| + chrome.settingsPrivate.Enforcement.ENFORCED ||
|
| + this.allSites || readOnlyList || !!exception.embeddingOrigin;
|
| },
|
|
|
| /**
|
|
|