diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 01:13:47 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 01:13:47 +0000 |
commit | 29e2fb456d3bf933168cf24bccaf05b1bea862fc (patch) | |
tree | 43eacb9a2201da4c6eaaa658facf35f9addd2a5b /content/plugin/webplugin_delegate_stub.h | |
parent | 83aa2eda2999b74dab6cb22d677acaaefa044da7 (diff) | |
download | chromium_src-29e2fb456d3bf933168cf24bccaf05b1bea862fc.zip chromium_src-29e2fb456d3bf933168cf24bccaf05b1bea862fc.tar.gz chromium_src-29e2fb456d3bf933168cf24bccaf05b1bea862fc.tar.bz2 |
Move NPAPI implementation out of webkit/plugins/npapi and into content.
Notes:
-gtk_plugin_container_manager* and gtk_plugin_container* move to content/browser/renderer_host/ since that's all where they're used
-plugin_list* and plugin_constants_win* move to content/common as they're used by child processes and the browser
-webplugin_impl* and webplugin_page_delegate.h move to content/renderer as that's where they're used. I will remove webplugin_page_delegate.h in a followup change as it's no longer needed.
-the rest moves to content/child/npapi
-a few constants moved from plugin_constants_win.h to plugin_util.h temporarily
BUG=237249
TBR=scottmg
Review URL: https://codereview.chromium.org/19761007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin/webplugin_delegate_stub.h')
-rw-r--r-- | content/plugin/webplugin_delegate_stub.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h index 370ff97..2eb346005 100644 --- a/content/plugin/webplugin_delegate_stub.h +++ b/content/plugin/webplugin_delegate_stub.h @@ -26,14 +26,9 @@ namespace WebKit { class WebInputEvent; } -namespace webkit { -namespace npapi { -class WebPluginDelegateImpl; -} -} - namespace content { class PluginChannel; +class WebPluginDelegateImpl; class WebPluginProxy; // Converts the IPC messages from WebPluginDelegateProxy into calls to the @@ -119,7 +114,7 @@ class WebPluginDelegateStub : public IPC::Listener, scoped_refptr<PluginChannel> channel_; base::WeakPtr<NPObjectStub> plugin_scriptable_object_; - webkit::npapi::WebPluginDelegateImpl* delegate_; + WebPluginDelegateImpl* delegate_; WebPluginProxy* webplugin_; bool in_destructor_; |