From 4e0616edf0c949858b67859b6f27a0c573425988 Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Fri, 28 May 2010 14:55:53 +0000 Subject: Add ppapi plugins to about:plugins Querying the plugin path and actual mime type is moved from creation of the WebPluginDelegate to creation of the WebPlugin. This cleaned up some code. R=jam BUG=45289 TEST=none Review URL: http://codereview.chromium.org/2262002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48484 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/support/test_webplugin_page_delegate.h | 5 ++--- webkit/support/webkit_support.cc | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'webkit/support') diff --git a/webkit/support/test_webplugin_page_delegate.h b/webkit/support/test_webplugin_page_delegate.h index d3f49a6..fe61032 100644 --- a/webkit/support/test_webplugin_page_delegate.h +++ b/webkit/support/test_webplugin_page_delegate.h @@ -17,9 +17,8 @@ class TestWebPluginPageDelegate : public webkit_glue::WebPluginPageDelegate { virtual ~TestWebPluginPageDelegate() {} virtual webkit_glue::WebPluginDelegate* CreatePluginDelegate( - const GURL& url, - const std::string& mime_type, - std::string* actual_mime_type) { return NULL; } + const FilePath& file_path, + const std::string& mime_type) { return NULL; } virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle) {} virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle) {} virtual void DidMovePlugin(const webkit_glue::WebPluginGeometry& move) {} diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index de338ac..5a22040 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -18,6 +18,7 @@ #include "base/weak_ptr.h" #include "net/base/net_util.h" #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/media/buffered_data_source.h" #include "webkit/glue/media/media_resource_loader_bridge_factory.h" @@ -72,7 +73,8 @@ class WebPluginImplWithPageDelegate WebPluginImplWithPageDelegate(WebFrame* frame, const WebPluginParams& params) : webkit_support::TestWebPluginPageDelegate(), - webkit_glue::WebPluginImpl(frame, params, AsWeakPtr()) {} + webkit_glue::WebPluginImpl( + frame, params, FilePath(), params.mimeType.utf8(), AsWeakPtr()) {} virtual ~WebPluginImplWithPageDelegate() {} private: DISALLOW_COPY_AND_ASSIGN(WebPluginImplWithPageDelegate); -- cgit v1.1