diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 06:27:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 06:27:50 +0000 |
| commit | 191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c (patch) | |
| tree | b982048e66a62646694c16c2cb10cb7ad30d8912 /chrome/plugin/webplugin_delegate_stub.cc | |
| parent | cfef856dd2ccece3cea13ccc96ac9579fd2b30b5 (diff) | |
| download | chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.zip chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.tar.gz chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.tar.bz2 | |
Re-land earlier patch that moves the NPAPI implementation from webkit/glue/plugins to webkit/plugins/npapi
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/webplugin_delegate_stub.cc')
| -rw-r--r-- | chrome/plugin/webplugin_delegate_stub.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc index ff0652d..0540adf 100644 --- a/chrome/plugin/webplugin_delegate_stub.cc +++ b/chrome/plugin/webplugin_delegate_stub.cc @@ -20,7 +20,7 @@ #include "skia/ext/platform_device.h" #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" -#include "webkit/glue/plugins/webplugin_delegate_impl.h" +#include "webkit/plugins/npapi/webplugin_delegate_impl.h" #include "webkit/glue/webcursor.h" #if defined(ENABLE_GPU) @@ -29,13 +29,15 @@ using WebKit::WebBindings; using WebKit::WebCursorInfo; -using webkit_glue::WebPlugin; -using webkit_glue::WebPluginResourceClient; +using webkit::npapi::WebPlugin; +using webkit::npapi::WebPluginResourceClient; class FinishDestructionTask : public Task { public: - FinishDestructionTask(WebPluginDelegateImpl* delegate, WebPlugin* webplugin) - : delegate_(delegate), webplugin_(webplugin) { } + FinishDestructionTask(webkit::npapi::WebPluginDelegateImpl* delegate, + WebPlugin* webplugin) + : delegate_(delegate), webplugin_(webplugin) { + } void Run() { // WebPlugin must outlive WebPluginDelegate. @@ -46,8 +48,8 @@ class FinishDestructionTask : public Task { } private: - WebPluginDelegateImpl* delegate_; - WebPlugin* webplugin_; + webkit::npapi::WebPluginDelegateImpl* delegate_; + webkit::npapi::WebPlugin* webplugin_; }; WebPluginDelegateStub::WebPluginDelegateStub( @@ -185,7 +187,8 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params, webplugin_ = new WebPluginProxy( channel_, instance_id_, page_url_, params.containing_window, params.host_render_view_routing_id); - delegate_ = WebPluginDelegateImpl::Create(path, mime_type_, parent); + delegate_ = webkit::npapi::WebPluginDelegateImpl::Create( + path, mime_type_, parent); if (delegate_) { webplugin_->set_delegate(delegate_); *result = delegate_->Initialize(params.url, |