diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:38:12 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:38:12 +0000 |
| commit | b692a128b073b297a4ce2aa7c468fdd37823e3a8 (patch) | |
| tree | 3561224ba86e8eabd75f3e7a2f2343002d9a58ff /chrome/plugin/webplugin_proxy.cc | |
| parent | b07c8d9a926a89d0aa7c0de2e1d2685b728a887e (diff) | |
| download | chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.zip chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.gz chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.bz2 | |
Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put
them in the webkit::npapi namespace.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6012002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/webplugin_proxy.cc')
| -rw-r--r-- | chrome/plugin/webplugin_proxy.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index bb77108..498df98 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -34,16 +34,17 @@ #endif #include "skia/ext/platform_device.h" #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" -#include "webkit/glue/plugins/webplugin_delegate_impl.h" +#include "webkit/plugins/npapi/webplugin_delegate_impl.h" #if defined(USE_X11) #include "app/x11_util_internal.h" #endif using WebKit::WebBindings; -using webkit_glue::WebPluginResourceClient; + +using webkit::npapi::WebPluginResourceClient; #if defined(OS_MACOSX) -using webkit_glue::WebPluginAcceleratedSurface; +using webkit::npapi::WebPluginAcceleratedSurface; #endif typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap; @@ -323,7 +324,8 @@ 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() & - WebPluginDelegateImpl::PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) { + webkit::npapi::WebPluginDelegateImpl:: + PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) { GURL request_url(url); if (!request_url.SchemeIs(chrome::kHttpScheme) && !request_url.SchemeIs(chrome::kHttpsScheme) && |