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_proxy.cc | |
| 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_proxy.cc')
| -rw-r--r-- | content/plugin/webplugin_proxy.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 49e2895..ba2524c 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -11,6 +11,7 @@ #include "base/memory/scoped_handle.h" #include "base/memory/shared_memory.h" #include "build/build_config.h" +#include "content/child/npapi/webplugin_delegate_impl.h" #include "content/child/npobject_proxy.h" #include "content/child/npobject_util.h" #include "content/child/plugin_messages.h" @@ -23,7 +24,6 @@ #include "third_party/WebKit/public/web/WebBindings.h" #include "ui/gfx/blit.h" #include "ui/gfx/canvas.h" -#include "webkit/plugins/npapi/webplugin_delegate_impl.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" @@ -42,11 +42,6 @@ using WebKit::WebBindings; -using webkit::npapi::WebPluginResourceClient; -#if defined(OS_MACOSX) -using webkit::npapi::WebPluginAcceleratedSurface; -#endif - namespace content { WebPluginProxy::SharedTransportDIB::SharedTransportDIB(TransportDIB* dib) @@ -323,8 +318,7 @@ void WebPluginProxy::HandleURLRequest(const char* url, // Please refer to https://bugzilla.mozilla.org/show_bug.cgi?id=366082 // for more details on this. if (delegate_->GetQuirks() & - webkit::npapi::WebPluginDelegateImpl:: - PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) { + WebPluginDelegateImpl::PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) { GURL request_url(url); if (!request_url.SchemeIs(chrome::kHttpScheme) && !request_url.SchemeIs(chrome::kHttpsScheme) && |