diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index c62755b..559339b 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -197,11 +197,17 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( IDS_PLUGIN_LOAD, true, true); } + bool pepper_plugin_was_registered = false; scoped_refptr<webkit::ppapi::PluginModule> pepper_module( - render_view->pepper_delegate_.CreatePepperPlugin(info.path)); - if (pepper_module) { - return render_view->CreatePepperPlugin( - frame, params, info.path, pepper_module.get()); + render_view->pepper_delegate_.CreatePepperPlugin( + info.path, + &pepper_plugin_was_registered)); + if (pepper_plugin_was_registered) { + if (pepper_module) { + return render_view->CreatePepperPlugin( + frame, params, info.path, pepper_module.get()); + } + return NULL; } return render_view->CreateNPAPIPlugin( |