diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:12:35 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:12:35 +0000 |
| commit | e0e75f67163f77051d8f62d5275dbf40627d5398 (patch) | |
| tree | 070d431dc290d9b9a69c79ceeb94ba7574ef1c31 /webkit/tools/test_shell/mac | |
| parent | 3370e3b7ee18664a43a9977efeab2166624d0a32 (diff) | |
| download | chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.zip chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.gz chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.bz2 | |
Revert 69755 - 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
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/5961004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/mac')
| -rw-r--r-- | webkit/tools/test_shell/mac/test_webview_delegate.mm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm index bae33f1..b4e553d 100644 --- a/webkit/tools/test_shell/mac/test_webview_delegate.mm +++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm @@ -11,9 +11,9 @@ #include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" #include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webcursor.h" +#include "webkit/glue/plugins/plugin_list.h" +#include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webmenurunner_mac.h" -#include "webkit/plugins/npapi/plugin_list.h" -#include "webkit/plugins/npapi/webplugin_delegate_impl.h" #include "webkit/tools/test_shell/test_shell.h" using WebKit::WebCursorInfo; @@ -168,7 +168,7 @@ void TestWebViewDelegate::runModal() { // WebPluginPageDelegate ------------------------------------------------------ -webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( +webkit_glue::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( const FilePath& path, const std::string& mime_type) { WebWidgetHost *host = GetWidgetHost(); @@ -176,8 +176,7 @@ webkit::npapi::WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate( return NULL; gfx::PluginWindowHandle containing_view = NULL; - return webkit::npapi::WebPluginDelegateImpl::Create( - path, mime_type, containing_view); + return WebPluginDelegateImpl::Create(path, mime_type, containing_view); } void TestWebViewDelegate::CreatedPluginWindow( @@ -189,7 +188,7 @@ void TestWebViewDelegate::WillDestroyPluginWindow( } void TestWebViewDelegate::DidMovePlugin( - const webkit::npapi::WebPluginGeometry& move) { + const webkit_glue::WebPluginGeometry& move) { // TODO(port): add me once plugins work. } |