diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 02:32:55 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 02:32:55 +0000 |
| commit | eaacd1f30dce47cbd261c950af3aa9588c753799 (patch) | |
| tree | 460f6e5954276215d4bb0bf1c7ede5006df3513e /content/shell/shell_content_renderer_client.h | |
| parent | d48989178865e7285b6c2aa4649752e5c240c5ca (diff) | |
| download | chromium_src-eaacd1f30dce47cbd261c950af3aa9588c753799.zip chromium_src-eaacd1f30dce47cbd261c950af3aa9588c753799.tar.gz chromium_src-eaacd1f30dce47cbd261c950af3aa9588c753799.tar.bz2 | |
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
Diffstat (limited to 'content/shell/shell_content_renderer_client.h')
| -rw-r--r-- | content/shell/shell_content_renderer_client.h | 5 |
1 files changed, 3 insertions, 2 deletions
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; |