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

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

Issue 17165004: <webview>: Partially migrate loadcommit event from content to chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with ToT Created 7 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
« no previous file with comments | « chrome/common/extensions/api/api.gyp ('k') | chrome/renderer/resources/extensions/web_view.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/resources/extensions/ad_view.js
diff --git a/chrome/renderer/resources/extensions/ad_view.js b/chrome/renderer/resources/extensions/ad_view.js
index fa1c0cf4a8a24ba52401da03b2571a425a44c254..1efda0eeff25c8cef12c28bdacdb3b9776cfc3c7 100644
--- a/chrome/renderer/resources/extensions/ad_view.js
+++ b/chrome/renderer/resources/extensions/ad_view.js
@@ -10,6 +10,7 @@
// TODO(rpaquay): This file is currently very similar to "web_view.js". Do we
// want to refactor to extract common pieces?
+var eventBindings = require('event_bindings');
var process = requireNative('process');
var watchForTag = require('tagWatcher').watchForTag;
@@ -73,6 +74,13 @@ var AD_VIEW_EVENTS = {
'sizechanged': ['oldHeight', 'oldWidth', 'newHeight', 'newWidth'],
};
+var createEvent = function(name) {
+ var eventOpts = {supportsListeners: true, supportsFilters: true};
+ return new eventBindings.Event(name, undefined, eventOpts);
+};
+
+var AdviewLoadCommitEvent = createEvent('adview.onLoadCommit');
+
/**
* List of supported ad-networks.
*
@@ -124,8 +132,7 @@ function AdView(adviewNode) {
AdView.prototype.createBrowserPluginNode_ = function() {
var browserPluginNode = document.createElement('object');
browserPluginNode.type = 'application/browser-plugin';
- // TODO(fsamuel): Change this to 'adview' once AdViewGuest is ready.
- browserPluginNode.setAttribute('api', 'webview');
+ browserPluginNode.setAttribute('api', 'adview');
// The <object> node fills in the <adview> container.
browserPluginNode.style.width = '100%';
browserPluginNode.style.height = '100%';
@@ -432,6 +439,21 @@ AdView.prototype.handleSrcMutation = function(mutation) {
* @private
*/
AdView.prototype.setupAdviewNodeEvents_ = function() {
+ var adviewNode = this.adviewNode_;
+ // TODO(fsamuel): Generalize this further as we add more events.
+ var onAttached = function(e) {
+ var detail = e.detail ? JSON.parse(e.detail) : {};
+ AdviewLoadCommitEvent.addListener(function(event) {
+ var adviewEvent = new Event('loadcommit', {bubbles: true});
+ var attribs = AD_VIEW_EVENTS['loadcommit'];
+ $Array.forEach(attribs, function(attribName) {
+ adviewEvent[attribName] = event[attribName];
+ });
+ adviewNode.dispatchEvent(adviewEvent);
+ }, {instanceId: detail.windowId});
+ };
+ this.browserPluginNode_.addEventListener('-internal-attached', onAttached);
+
for (var eventName in AD_VIEW_EVENTS) {
this.setupEvent_(eventName, AD_VIEW_EVENTS[eventName]);
}
« no previous file with comments | « chrome/common/extensions/api/api.gyp ('k') | chrome/renderer/resources/extensions/web_view.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698