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

Unified Diff: extensions/renderer/resources/app_window_custom_bindings.js

Issue 2912883004: [Extensions Bindings] Don't allow `event` module with native bindings (Closed)
Patch Set: lazyboy's Created 3 years, 6 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: extensions/renderer/resources/app_window_custom_bindings.js
diff --git a/extensions/renderer/resources/app_window_custom_bindings.js b/extensions/renderer/resources/app_window_custom_bindings.js
index 2917c32e77427b9dad64bd16578ed08c4f03a319..2432366ca1951473cce343a6c0a8c5ce986741fd 100644
--- a/extensions/renderer/resources/app_window_custom_bindings.js
+++ b/extensions/renderer/resources/app_window_custom_bindings.js
@@ -6,7 +6,6 @@
var appWindowNatives = requireNative('app_window_natives');
var runtimeNatives = requireNative('runtime');
-var Event = require('event_bindings').Event;
var forEach = require('utils').forEach;
var renderFrameObserverNatives = requireNative('renderFrameObserverNatives');
@@ -20,6 +19,17 @@ var kSetSizeConstraintsFunction = 'setSizeConstraints';
if (!apiBridge)
var binding = require('binding').Binding;
+var jsEvent;
+function createAnonymousEvent() {
+ if (bindingUtil) {
+ // Native custom events ignore schema.
+ return bindingUtil.createCustomEvent(undefined, undefined, false);
+ }
+ if (!jsEvent)
+ jsEvent = require('event_bindings').Event;
+ return new jsEvent();
+}
+
// Bounds class definition.
var Bounds = function(boundsKey) {
privates(this).boundsKey_ = boundsKey;
@@ -211,7 +221,7 @@ appWindow.registerCustomHook(function(bindingsAPI) {
currentWindowInternal =
getInternalApi ?
getInternalApi('app.currentWindowInternal') :
- binding.create('app.currentWindowInternal').generate();
+ binding.create('app.currentWindowInternal').generate();
var AppWindow = function() {
this.innerBounds = new Bounds('innerBounds');
this.outerBounds = new Bounds('outerBounds');
@@ -225,7 +235,7 @@ appWindow.registerCustomHook(function(bindingsAPI) {
AppWindow.prototype.moveTo = $Function.bind(window.moveTo, window);
AppWindow.prototype.resizeTo = $Function.bind(window.resizeTo, window);
AppWindow.prototype.contentWindow = window;
- AppWindow.prototype.onClosed = new Event();
+ AppWindow.prototype.onClosed = createAnonymousEvent();
AppWindow.prototype.close = function() {
this.contentWindow.close();
};
« no previous file with comments | « extensions/renderer/resources/app_runtime_custom_bindings.js ('k') | extensions/renderer/resources/guest_view/guest_view.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698