diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 17:21:03 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 16:25:15 +0000 |
commit | c551f43206405019121bd2b2c93714319a0a3300 (patch) | |
tree | 1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js | |
parent | 7961cea6d1041e3e454dae6a1da660b453efd238 (diff) |
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
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.js | 13 |
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 */ |