diff options
Diffstat (limited to 'content/plugin/plugin_thread.cc')
| -rw-r--r-- | content/plugin/plugin_thread.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index 865ea60..19f170a 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -21,16 +21,15 @@ #include "base/process_util.h" #include "base/threading/thread_local.h" #include "content/child/child_process.h" +#include "content/child/npapi/plugin_lib.h" +#include "content/child/npapi/webplugin_delegate_impl.h" #include "content/child/npobject_util.h" #include "content/common/plugin_process_messages.h" #include "content/public/common/content_switches.h" #include "content/public/plugin/content_plugin_client.h" #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/plugin_utils.h" -#include "webkit/plugins/npapi/webplugin_delegate_impl.h" #if defined(TOOLKIT_GTK) #include "ui/gfx/gtk_util.h" @@ -116,8 +115,7 @@ PluginThread::PluginThread() // Preload the library to avoid loading, unloading then reloading preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path, NULL); - scoped_refptr<webkit::npapi::PluginLib> plugin( - webkit::npapi::PluginLib::CreatePluginLib(plugin_path)); + scoped_refptr<PluginLib> plugin(PluginLib::CreatePluginLib(plugin_path)); if (plugin.get()) { plugin->NP_Initialize(); // For OOP plugins the plugin dll will be unloaded during process shutdown @@ -143,7 +141,7 @@ void PluginThread::Shutdown() { preloaded_plugin_module_ = NULL; } NPChannelBase::CleanupChannels(); - webkit::npapi::PluginLib::UnloadAllPlugins(); + PluginLib::UnloadAllPlugins(); if (webkit::npapi::ShouldForcefullyTerminatePluginProcess()) base::KillProcess(base::GetCurrentProcessHandle(), 0, /* wait= */ false); |