From 191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 21 Dec 2010 06:27:50 +0000 Subject: 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 --- chrome/renderer/webplugin_delegate_proxy.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'chrome/renderer/webplugin_delegate_proxy.h') diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h index 2c20583..30e212e 100644 --- a/chrome/renderer/webplugin_delegate_proxy.h +++ b/chrome/renderer/webplugin_delegate_proxy.h @@ -18,8 +18,8 @@ #include "googleurl/src/gurl.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message.h" -#include "webkit/glue/plugins/webplugininfo.h" -#include "webkit/glue/plugins/webplugin_delegate.h" +#include "webkit/plugins/npapi/webplugininfo.h" +#include "webkit/plugins/npapi/webplugin_delegate.h" #if defined(OS_MACOSX) #include "base/hash_tables.h" @@ -44,14 +44,16 @@ namespace skia { class PlatformCanvas; } -namespace webkit_glue { +namespace webkit { +namespace npapi { class WebPlugin; } +} // An implementation of WebPluginDelegate that proxies all calls to // the plugin process. class WebPluginDelegateProxy - : public webkit_glue::WebPluginDelegate, + : public webkit::npapi::WebPluginDelegate, public IPC::Channel::Listener, public IPC::Message::Sender, public base::SupportsWeakPtr { @@ -64,7 +66,7 @@ class WebPluginDelegateProxy virtual bool Initialize(const GURL& url, const std::vector& arg_names, const std::vector& arg_values, - webkit_glue::WebPlugin* plugin, + webkit::npapi::WebPlugin* plugin, bool load_manually); virtual void UpdateGeometry(const gfx::Rect& window_rect, const gfx::Rect& clip_rect); @@ -113,9 +115,9 @@ class WebPluginDelegateProxy virtual void DidFinishManualLoading(); virtual void DidManualLoadFail(); virtual void InstallMissingPlugin(); - virtual webkit_glue::WebPluginResourceClient* CreateResourceClient( + virtual webkit::npapi::WebPluginResourceClient* CreateResourceClient( unsigned long resource_id, const GURL& url, int notify_id); - virtual webkit_glue::WebPluginResourceClient* CreateSeekableResourceClient( + virtual webkit::npapi::WebPluginResourceClient* CreateSeekableResourceClient( unsigned long resource_id, int range_request_id); CommandBufferProxy* CreateCommandBuffer(); @@ -231,13 +233,13 @@ class WebPluginDelegateProxy #endif base::WeakPtr render_view_; - webkit_glue::WebPlugin* plugin_; + webkit::npapi::WebPlugin* plugin_; bool uses_shared_bitmaps_; gfx::PluginWindowHandle window_; scoped_refptr channel_host_; std::string mime_type_; int instance_id_; - WebPluginInfo info_; + webkit::npapi::WebPluginInfo info_; gfx::Rect plugin_rect_; gfx::Rect clip_rect_; -- cgit v1.1