Commit 4168a77a authored by lazyboy@chromium.org's avatar lazyboy@chromium.org

Move event stuff of web_view.js to its own class/file.

Make event filtered by viewInstanceId instead of instanceId for guests.

BUG=

Review URL: https://codereview.chromium.org/333713005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278627 0039d316-1c4b-4281-b951-d872f2087c98
parent a027734e
......@@ -256,7 +256,7 @@ void GuestViewBase::DispatchEvent(Event* event) {
Profile* profile = Profile::FromBrowserContext(browser_context_);
extensions::EventFilteringInfo info;
info.SetInstanceID(guest_instance_id_);
info.SetInstanceID(view_instance_id_);
scoped_ptr<base::ListValue> args(new base::ListValue());
args->Append(event->GetArguments().release());
......
......@@ -169,6 +169,7 @@
'renderer/resources/extensions/tts_engine_custom_bindings.js',
'renderer/resources/extensions/web_request_custom_bindings.js',
'renderer/resources/extensions/web_view.js',
'renderer/resources/extensions/web_view_events.js',
'renderer/resources/extensions/web_view_experimental.js',
'renderer/resources/extensions/webview_custom_bindings.js',
'renderer/chrome_content_renderer_client.cc',
......
......@@ -240,6 +240,7 @@ void ChromeExtensionsDispatcherDelegate::PopulateSourceMap(
// Note: webView not webview so that this doesn't interfere with the
// chrome.webview API bindings.
source_map->RegisterSource("webView", IDR_WEB_VIEW_JS);
source_map->RegisterSource("webViewEvents", IDR_WEB_VIEW_EVENTS_JS);
source_map->RegisterSource("webViewExperimental",
IDR_WEB_VIEW_EXPERIMENTAL_JS);
source_map->RegisterSource("webViewRequest",
......
This diff is collapsed.
......@@ -10,7 +10,7 @@
var ContextMenusSchema =
requireNative('schema_registry').GetSchema('contextMenus');
var CreateEvent = require('webView').CreateEvent;
var CreateEvent = require('webViewEvents').CreateEvent;
var EventBindings = require('event_bindings');
var MessagingNatives = requireNative('messaging_natives');
var WebView = require('webView').WebView;
......@@ -245,7 +245,7 @@ WebViewInternal.maybeRegisterExperimentalAPIs = function(proto) {
};
/** @private */
WebViewInternal.prototype.setupExperimentalContextMenus_ = function() {
WebViewInternal.prototype.setupExperimentalContextMenus = function() {
var self = this;
var createContextMenus = function() {
return function() {
......
......@@ -83,6 +83,7 @@
<include name="IDR_WEB_REQUEST_INTERNAL_CUSTOM_BINDINGS_JS" file="extensions\web_request_internal_custom_bindings.js" type="BINDATA" />
<include name="IDR_WEBSTORE_CUSTOM_BINDINGS_JS" file="extensions\webstore_custom_bindings.js" type="BINDATA" />
<include name="IDR_WEB_VIEW_DENY_JS" file="extensions\web_view_deny.js" type="BINDATA" />
<include name="IDR_WEB_VIEW_EVENTS_JS" file="extensions\web_view_events.js" type="BINDATA" />
<include name="IDR_WEB_VIEW_EXPERIMENTAL_JS" file="extensions\web_view_experimental.js" type="BINDATA" />
<include name="IDR_WEB_VIEW_JS" file="extensions\web_view.js" type="BINDATA" />
<include name="IDR_WEBVIEW_CUSTOM_BINDINGS_JS" file="extensions\webview_custom_bindings.js" type="BINDATA" />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment