Commit 8638bd49 authored by dschuyler's avatar dschuyler Committed by Commit bot

[MD settings] omit embeddingOrigin for site exceptions

This CL changes how the embeddingOrigin is set on content exceptions.
This is now more like it was done in the old options, where the
embedding origin was not sent from JavaScript.

BUG=714584
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2848933003
Cr-Commit-Position: refs/heads/master@{#468199}
parent b416391e
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment