diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
| commit | b6badfa6a538f889025db775662fe61fcb45dc37 (patch) | |
| tree | d12fb54a46443e18a9fa9a671392966ba6751202 /webkit/support/webkit_support.cc | |
| parent | e0e75f67163f77051d8f62d5275dbf40627d5398 (diff) | |
| download | chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.zip chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.gz chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.bz2 | |
Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69766, which was itself a failed
revert of r69755.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5996003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support/webkit_support.cc')
| -rw-r--r-- | webkit/support/webkit_support.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 26ae930..d088d3c 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -35,13 +35,13 @@ #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/media/video_renderer_impl.h" -#include "webkit/glue/plugins/plugin_list.h" -#include "webkit/glue/plugins/webplugin_impl.h" -#include "webkit/glue/plugins/webplugin_page_delegate.h" -#include "webkit/glue/plugins/webplugininfo.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitclient_impl.h" #include "webkit/glue/webmediaplayer_impl.h" +#include "webkit/plugins/npapi/plugin_list.h" +#include "webkit/plugins/npapi/webplugin_impl.h" +#include "webkit/plugins/npapi/webplugin_page_delegate.h" +#include "webkit/plugins/npapi/webplugininfo.h" #include "webkit/support/platform_support.h" #include "webkit/support/test_webplugin_page_delegate.h" #include "webkit/support/test_webkit_client.h" @@ -145,14 +145,14 @@ class TestEnvironment { class WebPluginImplWithPageDelegate : public webkit_support::TestWebPluginPageDelegate, public base::SupportsWeakPtr<WebPluginImplWithPageDelegate>, - public webkit_glue::WebPluginImpl { + public webkit::npapi::WebPluginImpl { public: WebPluginImplWithPageDelegate(WebFrame* frame, const WebPluginParams& params, const FilePath& path, const std::string& mime_type) : webkit_support::TestWebPluginPageDelegate(), - webkit_glue::WebPluginImpl( + webkit::npapi::WebPluginImpl( frame, params, path, mime_type, AsWeakPtr()) {} virtual ~WebPluginImplWithPageDelegate() {} private: @@ -250,9 +250,9 @@ WebKit::WebKitClient* GetWebKitClient() { WebPlugin* CreateWebPlugin(WebFrame* frame, const WebPluginParams& params) { const bool kAllowWildcard = true; - WebPluginInfo info; + webkit::npapi::WebPluginInfo info; std::string actual_mime_type; - if (!NPAPI::PluginList::Singleton()->GetPluginInfo( + if (!webkit::npapi::PluginList::Singleton()->GetPluginInfo( params.url, params.mimeType.utf8(), kAllowWildcard, &info, &actual_mime_type) || !info.enabled) { return NULL; |