diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-19 23:41:24 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-19 23:41:24 +0000 |
| commit | 2d09a70aeb1e05dfc0a4665e86bb368056531f05 (patch) | |
| tree | b2bd9227020e0b287b68959808e2cf4ae0314f90 /content/renderer | |
| parent | 15d8aa7891a36577e6022e14d4c0b468a2b30f4c (diff) | |
| download | chromium_src-2d09a70aeb1e05dfc0a4665e86bb368056531f05.zip chromium_src-2d09a70aeb1e05dfc0a4665e86bb368056531f05.tar.gz chromium_src-2d09a70aeb1e05dfc0a4665e86bb368056531f05.tar.bz2 | |
Fix chrome.webRequest.onBeforeRequest for requests coming from NPAPI plugin processes.
BUG=332481
R=jochen@chromium.org
Review URL: https://codereview.chromium.org/132233022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/npapi/webplugin_delegate_proxy.cc | 3 | ||||
| -rw-r--r-- | content/renderer/npapi/webplugin_delegate_proxy.h | 3 | ||||
| -rw-r--r-- | content/renderer/npapi/webplugin_impl.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc index cbc2f2c..19797f9 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/content/renderer/npapi/webplugin_delegate_proxy.cc @@ -1128,7 +1128,8 @@ void WebPluginDelegateProxy::FetchURL(unsigned long resource_id, bool notify_redirects, bool is_plugin_src_load, int origin_pid, - int render_frame_id) { + int render_frame_id, + int render_view_id) { PluginMsg_FetchURL_Params params; params.resource_id = resource_id; params.notify_id = notify_id; diff --git a/content/renderer/npapi/webplugin_delegate_proxy.h b/content/renderer/npapi/webplugin_delegate_proxy.h index 38c4176..6df1ab7 100644 --- a/content/renderer/npapi/webplugin_delegate_proxy.h +++ b/content/renderer/npapi/webplugin_delegate_proxy.h @@ -138,7 +138,8 @@ class WebPluginDelegateProxy bool notify_redirects, bool is_plugin_src_load, int origin_pid, - int render_frame_id) OVERRIDE; + int render_frame_id, + int render_view_id) OVERRIDE; gfx::PluginWindowHandle GetPluginWindowHandle(); diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc index c8db6d5..bb8531d 100644 --- a/content/renderer/npapi/webplugin_impl.cc +++ b/content/renderer/npapi/webplugin_impl.cc @@ -1203,7 +1203,8 @@ void WebPluginImpl::HandleURLRequestInternal(const char* url, delegate_->FetchURL(resource_id, notify_id, complete_url, first_party_for_cookies, method, buf, len, referrer, notify_redirects, is_plugin_src_load, 0, - render_frame_->GetRoutingID()); + render_frame_->GetRoutingID(), + render_view_->GetRoutingID()); } else { WebPluginResourceClient* resource_client = delegate_->CreateResourceClient( resource_id, complete_url, notify_id); |