diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 02:42:14 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 02:42:14 +0000 |
| commit | f520b5b5e0822d6ea04edcf064274ac515581806 (patch) | |
| tree | 778819460ce7ca1fd66f97e2bed0fba0200b7eba /content/plugin | |
| parent | 255f8277e7e4f9e19b8f19988ded37e38c932c73 (diff) | |
| download | chromium_src-f520b5b5e0822d6ea04edcf064274ac515581806.zip chromium_src-f520b5b5e0822d6ea04edcf064274ac515581806.tar.gz chromium_src-f520b5b5e0822d6ea04edcf064274ac515581806.tar.bz2 | |
Revert r108760 / reland r108744, r108753 w/ fix
Modify code in chrome to call wrapper functions on PluginService
TBR=rsesek@chromium.org, jam@chromium.org
BUG=90442
TEST=browser_tests PluginServiceTest.* pass on the Mac
Review URL: http://codereview.chromium.org/8493026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
| -rw-r--r-- | content/plugin/plugin_thread.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index 195bffe..7951a8f 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -27,6 +27,7 @@ #include "ipc/ipc_channel_handle.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/plugin_lib.h" +#include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h" #if defined(TOOLKIT_USES_GTK) @@ -114,6 +115,9 @@ PluginThread::PluginThread() content::GetContentClient()->plugin()->PluginProcessStarted( plugin.get() ? plugin->plugin_info().name : string16()); + content::GetContentClient()->AddNPAPIPlugins( + webkit::npapi::PluginList::Singleton()); + // Certain plugins, such as flash, steal the unhandled exception filter // thus we never get crash reports when they fault. This call fixes it. message_loop()->set_exception_restoration(true); |