Skip to content

Commit

Permalink
Move event stuff of web_view.js to its own class/file.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
lazyboy@chromium.org committed Jun 20, 2014
1 parent a027734 commit 4168a77
Show file tree
Hide file tree
Showing 7 changed files with 652 additions and 629 deletions.
2 changes: 1 addition & 1 deletion chrome/browser/guest_view/guest_view_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
1 change: 1 addition & 0 deletions chrome/chrome_renderer.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading

0 comments on commit 4168a77

Please sign in to comment.