| Index: chrome/renderer/resources/extensions/chrome_web_view_experimental.js
|
| diff --git a/chrome/renderer/resources/extensions/chrome_web_view_experimental.js b/chrome/renderer/resources/extensions/chrome_web_view_experimental.js
|
| index ed82adf6b49c9d0f89086542a1d520ac0b915b95..db4a130c17e4e08b61afd6acc748a1e20209f1b0 100644
|
| --- a/chrome/renderer/resources/extensions/chrome_web_view_experimental.js
|
| +++ b/chrome/renderer/resources/extensions/chrome_web_view_experimental.js
|
| @@ -18,6 +18,7 @@ var EventBindings = require('event_bindings');
|
| var idGeneratorNatives = requireNative('id_generator');
|
| var MessagingNatives = requireNative('messaging_natives');
|
| var utils = require('utils');
|
| +var WebViewEvents = require('webViewEvents').WebViewEvents;
|
| var WebViewImpl = require('webView').WebViewImpl;
|
|
|
| function GetUniqueSubEventName(eventName) {
|
| @@ -94,8 +95,9 @@ var WebViewContextMenus = utils.expose(
|
| { functions: ['create', 'remove', 'removeAll', 'update'] });
|
|
|
| /** @private */
|
| -WebViewImpl.prototype.maybeHandleContextMenu = function(e, webViewEvent) {
|
| - var requestId = e.requestId;
|
| +WebViewEvents.prototype.handleContextMenu = function(event, eventName) {
|
| + var webViewEvent = this.makeDomEvent(event, eventName);
|
| + var requestId = event.requestId;
|
| // Construct the event.menu object.
|
| var actionTaken = false;
|
| var validateCall = function() {
|
| @@ -112,11 +114,11 @@ WebViewImpl.prototype.maybeHandleContextMenu = function(e, webViewEvent) {
|
| validateCall();
|
| // TODO(lazyboy): WebViewShowContextFunction doesn't do anything useful
|
| // with |items|, implement.
|
| - ChromeWebView.showContextMenu(this.guest.getId(), requestId, items);
|
| + ChromeWebView.showContextMenu(this.view.guest.getId(), requestId, items);
|
| }.bind(this)
|
| };
|
| webViewEvent.menu = menu;
|
| - var element = this.element;
|
| + var element = this.view.element;
|
| var defaultPrevented = !element.dispatchEvent(webViewEvent);
|
| if (actionTaken) {
|
| return;
|
| @@ -124,7 +126,8 @@ WebViewImpl.prototype.maybeHandleContextMenu = function(e, webViewEvent) {
|
| if (!defaultPrevented) {
|
| actionTaken = true;
|
| // The default action is equivalent to just showing the context menu as is.
|
| - ChromeWebView.showContextMenu(this.guest.getId(), requestId, undefined);
|
| + ChromeWebView.showContextMenu(
|
| + this.view.guest.getId(), requestId, undefined);
|
|
|
| // TODO(lazyboy): Figure out a way to show warning message only when
|
| // listeners are registered for this event.
|
|
|