From eaacd1f30dce47cbd261c950af3aa9588c753799 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 23 Sep 2011 02:32:55 +0000 Subject: Don't depend on the embedder creating a plugin. That way embedders can always provide an empty ContentRendererClient interface and still have functional rendering. Review URL: http://codereview.chromium.org/7972018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102427 0039d316-1c4b-4281-b951-d872f2087c98 --- content/shell/shell_content_renderer_client.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'content/shell/shell_content_renderer_client.h') diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h index b9ba912..b498106 100644 --- a/content/shell/shell_content_renderer_client.h +++ b/content/shell/shell_content_renderer_client.h @@ -19,10 +19,11 @@ class ShellContentRendererClient : public ContentRendererClient { virtual void SetNumberOfViews(int number_of_views) OVERRIDE; virtual SkBitmap* GetSadPluginBitmap() OVERRIDE; virtual std::string GetDefaultEncoding() OVERRIDE; - virtual WebKit::WebPlugin* CreatePlugin( + virtual bool OverrideCreatePlugin( RenderView* render_view, WebKit::WebFrame* frame, - const WebKit::WebPluginParams& params) OVERRIDE; + const WebKit::WebPluginParams& params, + WebKit::WebPlugin** plugin) OVERRIDE; virtual void ShowErrorPage(RenderView* render_view, WebKit::WebFrame* frame, int http_status_code) OVERRIDE; -- cgit v1.1