| Index: content/browser/frame_host/render_frame_message_filter.cc
|
| diff --git a/content/browser/frame_host/render_frame_message_filter.cc b/content/browser/frame_host/render_frame_message_filter.cc
|
| index a4a91b09e4869065e1ba2ea995e6442ea2a7d189..3e4b439fe1dd7dc19727b52443b4636d50939694 100644
|
| --- a/content/browser/frame_host/render_frame_message_filter.cc
|
| +++ b/content/browser/frame_host/render_frame_message_filter.cc
|
| @@ -466,9 +466,9 @@ void RenderFrameMessageFilter::SetCookie(int32_t render_frame_id,
|
|
|
| #if defined(ENABLE_PLUGINS)
|
|
|
| -void RenderFrameMessageFilter::OnGetPlugins(
|
| - bool refresh,
|
| - IPC::Message* reply_msg) {
|
| +void RenderFrameMessageFilter::OnGetPlugins(bool refresh,
|
| + GURL url,
|
| + IPC::Message* reply_msg) {
|
| // Don't refresh if the specified threshold has not been passed. Note that
|
| // this check is performed before off-loading to the file thread. The reason
|
| // we do this is that some pages tend to request that the list of plugins be
|
| @@ -487,11 +487,12 @@ void RenderFrameMessageFilter::OnGetPlugins(
|
| }
|
|
|
| PluginServiceImpl::GetInstance()->GetPlugins(base::Bind(
|
| - &RenderFrameMessageFilter::GetPluginsCallback, this, reply_msg));
|
| + &RenderFrameMessageFilter::GetPluginsCallback, this, reply_msg, url));
|
| }
|
|
|
| void RenderFrameMessageFilter::GetPluginsCallback(
|
| IPC::Message* reply_msg,
|
| + GURL url,
|
| const std::vector<WebPluginInfo>& all_plugins) {
|
| // Filter the plugin list.
|
| PluginServiceFilter* filter = PluginServiceImpl::GetInstance()->GetFilter();
|
| @@ -506,7 +507,7 @@ void RenderFrameMessageFilter::GetPluginsCallback(
|
| routing_id,
|
| resource_context_,
|
| GURL(),
|
| - GURL(),
|
| + url,
|
| &plugin)) {
|
| plugins.push_back(plugin);
|
| }
|
|
|