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/test_webplugin_page_delegate.h | |
| 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/test_webplugin_page_delegate.h')
| -rw-r--r-- | webkit/support/test_webplugin_page_delegate.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/webkit/support/test_webplugin_page_delegate.h b/webkit/support/test_webplugin_page_delegate.h index 95f2b4a..1b4df88 100644 --- a/webkit/support/test_webplugin_page_delegate.h +++ b/webkit/support/test_webplugin_page_delegate.h @@ -7,26 +7,27 @@ #include <string> -#include "webkit/glue/plugins/webplugin_delegate_impl.h" -#include "webkit/glue/plugins/webplugin_page_delegate.h" +#include "webkit/plugins/npapi/webplugin_delegate_impl.h" +#include "webkit/plugins/npapi/webplugin_page_delegate.h" namespace webkit_support { -class TestWebPluginPageDelegate : public webkit_glue::WebPluginPageDelegate { +class TestWebPluginPageDelegate : public webkit::npapi::WebPluginPageDelegate { public: TestWebPluginPageDelegate() {} virtual ~TestWebPluginPageDelegate() {} - virtual webkit_glue::WebPluginDelegate* CreatePluginDelegate( + virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate( const FilePath& file_path, const std::string& mime_type) { // We don't need a valid native window handle in layout tests. // So just passing 0. - return WebPluginDelegateImpl::Create(file_path, mime_type, 0); + return webkit::npapi::WebPluginDelegateImpl::Create( + file_path, mime_type, 0); } virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle) {} virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle) {} - virtual void DidMovePlugin(const webkit_glue::WebPluginGeometry& move) {} + virtual void DidMovePlugin(const webkit::npapi::WebPluginGeometry& move) {} virtual void DidStartLoadingForPlugin() {} virtual void DidStopLoadingForPlugin() {} virtual void ShowModalHTMLDialogForPlugin( @@ -40,4 +41,5 @@ class TestWebPluginPageDelegate : public webkit_glue::WebPluginPageDelegate { }; } // namespace webkit_support + #endif // WEBKIT_SUPPORT_TEST_WEBPLUGIN_PAGE_DELEGATE_H_ |