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

Unified Diff: chrome/renderer/resources/extensions/web_view.js

Issue 19679002: <webview>: Implement dialog API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test Created 7 years, 5 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
Index: chrome/renderer/resources/extensions/web_view.js
diff --git a/chrome/renderer/resources/extensions/web_view.js b/chrome/renderer/resources/extensions/web_view.js
index d8a666abf1c295c535f9a01a21f023d1c76db3df..2d1a083b53e476f03fa0b366b954f851ddf8dc71 100644
--- a/chrome/renderer/resources/extensions/web_view.js
+++ b/chrome/renderer/resources/extensions/web_view.js
@@ -423,7 +423,7 @@ WebView.prototype.setupNewWindowEvent_ = function() {
var detail = e.detail ? JSON.parse(e.detail) : {};
if (detail.id != requestId)
return;
- browserPluginNode['-internal-setPermission'](requestId, false);
+ browserPluginNode['-internal-setPermission'](requestId, false, '');
}
browserPluginNode.addEventListener('-internal-newwindow', function(e) {
@@ -463,12 +463,12 @@ WebView.prototype.setupNewWindowEvent_ = function() {
// then we will fail and it will be treated as if the new window
// was rejected. The permission API plumbing is used here to clean
// up the state created for the new window if attaching fails.
- browserPluginNode['-internal-setPermission'](requestId, attached);
+ browserPluginNode['-internal-setPermission'](requestId, attached, '');
}, 0);
},
discard: function() {
validateCall();
- browserPluginNode['-internal-setPermission'](requestId, false);
+ browserPluginNode['-internal-setPermission'](requestId, false, '');
}
};
evt.window = window;
@@ -483,7 +483,7 @@ WebView.prototype.setupNewWindowEvent_ = function() {
if (!actionTaken && !defaultPrevented) {
actionTaken = true;
// The default action is to discard the window.
- browserPluginNode['-internal-setPermission'](requestId, false);
+ browserPluginNode['-internal-setPermission'](requestId, false, '');
console.warn(WARNING_MSG_NEWWINDOW_BLOCKED);
}
});
@@ -552,7 +552,7 @@ WebView.prototype.setupPermissionEvent_ = function() {
var detail = e.detail ? JSON.parse(e.detail) : {};
if (detail.id != requestId)
return;
- browserPluginNode['-internal-setPermission'](requestId, false);
+ browserPluginNode['-internal-setPermission'](requestId, false, '');
}
browserPluginNode.addEventListener(internalevent, function(e) {
@@ -575,7 +575,7 @@ WebView.prototype.setupPermissionEvent_ = function() {
if (decisionMade) {
throw new Error(ERROR_MSG_PERMISSION_ALREADY_DECIDED);
} else {
- browserPluginNode['-internal-setPermission'](requestId, true);
+ browserPluginNode['-internal-setPermission'](requestId, true, '');
decisionMade = true;
}
},
@@ -583,7 +583,7 @@ WebView.prototype.setupPermissionEvent_ = function() {
if (decisionMade) {
throw new Error(ERROR_MSG_PERMISSION_ALREADY_DECIDED);
} else {
- browserPluginNode['-internal-setPermission'](requestId, false);
+ browserPluginNode['-internal-setPermission'](requestId, false, '');
decisionMade = true;
}
}
@@ -600,7 +600,7 @@ WebView.prototype.setupPermissionEvent_ = function() {
var defaultPrevented = !node.dispatchEvent(evt);
if (!decisionMade && !defaultPrevented) {
decisionMade = true;
- browserPluginNode['-internal-setPermission'](requestId, false);
+ browserPluginNode['-internal-setPermission'](requestId, false, '');
}
}
});
« no previous file with comments | « chrome/browser/extensions/web_view_browsertest.cc ('k') | chrome/renderer/resources/extensions/web_view_experimental.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698