summaryrefslogtreecommitdiffstats
path: root/content/browser/plugin_service_impl.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 01:28:08 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-13 01:28:08 +0000
commit209f2ae5d9ce448bb1bee1b554aaa4552d734af3 (patch)
tree56a0bcdda8e85e17228fed372d588d38813e0112 /content/browser/plugin_service_impl.h
parent71c3d0d7d5b21c037bf27c9c82b348914da15c25 (diff)
downloadchromium_src-209f2ae5d9ce448bb1bee1b554aaa4552d734af3.zip
chromium_src-209f2ae5d9ce448bb1bee1b554aaa4552d734af3.tar.gz
chromium_src-209f2ae5d9ce448bb1bee1b554aaa4552d734af3.tar.bz2
Move PluginServiceFilterParams to plugin_service_impl.h
BUG=98716 R=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/9677023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.h')
-rw-r--r--content/browser/plugin_service_impl.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
index 4b6976d..be36075 100644
--- a/content/browser/plugin_service_impl.h
+++ b/content/browser/plugin_service_impl.h
@@ -47,10 +47,9 @@ class MessageLoopProxy;
namespace content {
class BrowserContext;
+class PluginServiceFilter;
class ResourceContext;
struct PepperPluginInfo;
-class PluginServiceFilter;
-struct PluginServiceFilterParams;
}
namespace webkit {
@@ -60,6 +59,15 @@ class PluginList;
}
}
+// base::Bind() has limited arity, and the filter-related methods tend to
+// surpass that limit.
+struct PluginServiceFilterParams {
+ int render_process_id;
+ int render_view_id;
+ GURL page_url;
+ content::ResourceContext* resource_context;
+};
+
class CONTENT_EXPORT PluginServiceImpl
: NON_EXPORTED_BASE(public content::PluginService),
public base::WaitableEventWatcher::Delegate,
@@ -175,7 +183,7 @@ class CONTENT_EXPORT PluginServiceImpl
// Binding directly to GetAllowedPluginForOpenChannelToPlugin() isn't possible
// because more arity is needed <http://crbug.com/98542>. This just forwards.
void ForwardGetAllowedPluginForOpenChannelToPlugin(
- const content::PluginServiceFilterParams& params,
+ const PluginServiceFilterParams& params,
const GURL& url,
const std::string& mime_type,
PluginProcessHost::Client* client,