diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-17 03:16:41 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-17 03:16:41 +0000 |
| commit | 07611759ae541c5bcdc382ba7a2e9b0c7da4a45e (patch) | |
| tree | 31bb75e95902169d87f32a3f8b6982797b45e06b /chrome/renderer | |
| parent | bd7edbb2be6c330db59bbbafd39b8064f4f64b29 (diff) | |
| download | chromium_src-07611759ae541c5bcdc382ba7a2e9b0c7da4a45e.zip chromium_src-07611759ae541c5bcdc382ba7a2e9b0c7da4a45e.tar.gz chromium_src-07611759ae541c5bcdc382ba7a2e9b0c7da4a45e.tar.bz2 | |
Wire experimental Flapper part two
Since the new pepper plugin can arrive later we needed a way to
integrate better with the webkit::PluginList, unfortunately there
is still value on the PepperPluginRegistry for development use
cases.
So this change adds new plugins to both the pepper plugin lists in
the browser (in PluginService) and the renderer (in PepperPluginRegistry)
on demand.
TEST=see bug
BUG=89248
Review URL: http://codereview.chromium.org/7670003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 31db342..369c86f 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -445,8 +445,8 @@ WebPlugin* ChromeContentRendererClient::CreatePluginImpl( bool pepper_plugin_was_registered = false; scoped_refptr<webkit::ppapi::PluginModule> pepper_module( - render_view->pepper_delegate()->CreatePepperPlugin( - info.path, &pepper_plugin_was_registered)); + render_view->pepper_delegate()->CreatePepperPluginModule( + info, &pepper_plugin_was_registered)); if (pepper_plugin_was_registered) { if (pepper_module) { return render_view->CreatePepperPlugin( |