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

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

Issue 2848933003: [MD settings] omit embeddingOrigin for site exceptions (Closed)
Patch Set: reduced changed files Created 3 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
index 6c19a604d00b8b4787b66160c5896823eafcd391..82954acfcc7ec99d64fd35166eb7e55d0a1fc056 100644
--- a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
+++ b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
@@ -326,15 +326,20 @@ cr.define('settings', function() {
/** @override */
resetCategoryPermissionForOrigin: function(
primaryPattern, secondaryPattern, contentType, incognito) {
- chrome.send('resetCategoryPermissionForOrigin',
+ chrome.send(
+ 'resetCategoryPermissionForOrigin',
[primaryPattern, secondaryPattern, contentType, incognito]);
},
/** @override */
setCategoryPermissionForOrigin: function(
primaryPattern, secondaryPattern, contentType, value, incognito) {
- chrome.send('setCategoryPermissionForOrigin',
- [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(
+ 'setCategoryPermissionForOrigin',
+ [primaryPattern, '', contentType, value, incognito]);
},
/** @override */
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698