summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/resources
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer/resources')
-rw-r--r--chrome/renderer/resources/event_bindings.js27
-rw-r--r--chrome/renderer/resources/extension_process_bindings.js5
-rw-r--r--chrome/renderer/resources/renderer_extension_bindings.js2
3 files changed, 21 insertions, 13 deletions
diff --git a/chrome/renderer/resources/event_bindings.js b/chrome/renderer/resources/event_bindings.js
index f8a6517..81dddde 100644
--- a/chrome/renderer/resources/event_bindings.js
+++ b/chrome/renderer/resources/event_bindings.js
@@ -8,9 +8,9 @@ var chromium = chromium || {};
// with that name will route through this object's listeners.
//
// Example:
- // chromium.ontabchanged = new Event('tabchanged');
- // chromium.ontabchanged.addListener(function(data) { alert(data); });
- // chromium.Event.dispatch_('tabchanged', 'hi');
+ // chromium.tabs.onTabChanged = new chromium.Event("tab-changed");
+ // chromium.tabs.onTabChanged.addListener(function(data) { alert(data); });
+ // chromium.Event.dispatch_("tab-changed", "hi");
// will result in an alert dialog that says 'hi'.
chromium.Event = function(opt_eventName) {
this.eventName_ = opt_eventName;
@@ -20,21 +20,24 @@ var chromium = chromium || {};
// A map of event names to the event object that is registered to that name.
chromium.Event.attached_ = {};
- // Dispatches a named event with the given JSON data, which is deserialized
- // before dispatch.
- chromium.Event.dispatchJSON_ = function(name, data) {
+ // Dispatches a named event with the given JSON array, which is deserialized
+ // before dispatch. The JSON array is the list of arguments that will be
+ // sent with the event callback.
+ chromium.Event.dispatchJSON_ = function(name, args) {
if (chromium.Event.attached_[name]) {
- if (data) {
- data = goog.json.parse(data);
+ if (args) {
+ args = goog.json.parse(args);
}
- chromium.Event.attached_[name].dispatch(data);
+ chromium.Event.attached_[name].dispatch.apply(
+ chromium.Event.attached_[name], args);
}
};
- // Dispatches a named event with the given object data.
- chromium.Event.dispatch_ = function(name, data) {
+ // Dispatches a named event with the given arguments, supplied as an array.
+ chromium.Event.dispatch_ = function(name, args) {
if (chromium.Event.attached_[name]) {
- chromium.Event.attached_[name].dispatch(data);
+ chromium.Event.attached_[name].dispatch.apply(
+ chromium.Event.attached_[name], args);
}
};
diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index 454a9b0..7b74283 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -129,6 +129,10 @@ var chromium;
chromium.tabs.removeTab.params = [
chromium.types.pInt
];
+
+ // onTabMoved sends ({tabId, windowId, fromIndex, toIndex}) as named
+ // arguments.
+ chromium.tabs.onTabMoved = new chromium.Event("tab-moved");
//----------------------------------------------------------------------------
@@ -136,3 +140,4 @@ var chromium;
chromium.self = {};
chromium.self.onConnect = new chromium.Event("channel-connect");
})();
+
diff --git a/chrome/renderer/resources/renderer_extension_bindings.js b/chrome/renderer/resources/renderer_extension_bindings.js
index fafd491..ef71f90 100644
--- a/chrome/renderer/resources/renderer_extension_bindings.js
+++ b/chrome/renderer/resources/renderer_extension_bindings.js
@@ -23,7 +23,7 @@ var chromium = chromium || {};
// Called by native code when a channel has been opened to this context.
chromium.Port.dispatchOnConnect_ = function(portId) {
var port = new chromium.Port(portId);
- chromium.Event.dispatch_("channel-connect", port);
+ chromium.Event.dispatch_("channel-connect", [port]);
};
// Called by native code when a message has been sent to the given port.