summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js')
-rw-r--r--chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js13
1 files changed, 9 insertions, 4 deletions
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js b/chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
index 267e480c034..2b826c3b5a2 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
@@ -14,8 +14,16 @@
* @enum {string}
*/
const ContentSettingProvider = {
+ POLICY: 'policy',
+ SUPERVISED_USER: 'supervised_user',
EXTENSION: 'extension',
+ INSTALLED_WEBAPP_PROVIDER: 'installed_webapp_provider',
+ NOTIFICATION_ANDROID: 'notification_android',
+ EPHEMERAL: 'ephemeral',
PREFERENCE: 'preference',
+ DEFAULT: 'default',
+ TESTS: 'tests',
+ TESTS_OTHER: 'tests_other'
};
/**
@@ -426,12 +434,9 @@ cr.define('settings', function() {
/** @override */
setCategoryPermissionForPattern(
primaryPattern, secondaryPattern, contentType, value, incognito) {
- // TODO(dschuyler): It may be incorrect for JS to send the embeddingOrigin
- // pattern. Look into removing this parameter from site_settings_handler.
- // Ignoring the |secondaryPattern| and using '' instead is a quick-fix.
chrome.send(
'setCategoryPermissionForPattern',
- [primaryPattern, '', contentType, value, incognito]);
+ [primaryPattern, secondaryPattern, contentType, value, incognito]);
}
/** @override */