diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 00:56:07 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 00:56:07 +0000 |
| commit | f38e25f12f542ed26b0b9d310d2e432297520995 (patch) | |
| tree | 91968df6d61551cadf4ec12152f9790e5904f1b5 /chrome/plugin | |
| parent | 53e45f18ee44a3b7ace0ebf96960c1af9f8f1ae6 (diff) | |
| download | chromium_src-f38e25f12f542ed26b0b9d310d2e432297520995.zip chromium_src-f38e25f12f542ed26b0b9d310d2e432297520995.tar.gz chromium_src-f38e25f12f542ed26b0b9d310d2e432297520995.tar.bz2 | |
plugins: move NativeLibrary into base.
NativeLibrary is used by some plugin code under chrome/.
Rather than including webkit/glue there, this relocation is the smallest
logical bite to take. :\
Review URL: http://codereview.chromium.org/87012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/plugin_thread.cc | 2 | ||||
| -rw-r--r-- | chrome/plugin/plugin_thread.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index fe9aa02..3b7c614 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -51,7 +51,7 @@ void PluginThread::Init() { notification_service_.reset(new NotificationService); // Preload the library to avoid loading, unloading then reloading - preloaded_plugin_module_ = NPAPI::PluginLib::LoadNativeLibrary(plugin_path_); + preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_); ChromePluginLib::Create(plugin_path_, GetCPBrowserFuncsForPlugin()); diff --git a/chrome/plugin/plugin_thread.h b/chrome/plugin/plugin_thread.h index 9b999e2..a110a2c 100644 --- a/chrome/plugin/plugin_thread.h +++ b/chrome/plugin/plugin_thread.h @@ -6,6 +6,7 @@ #define CHROME_PLUGIN_PLUGIN_THREAD_H_ #include "base/file_path.h" +#include "base/native_library.h" #include "chrome/common/child_thread.h" #include "chrome/plugin/plugin_channel.h" @@ -35,7 +36,7 @@ class PluginThread : public ChildThread { scoped_ptr<NotificationService> notification_service_; // The plugin module which is preloaded in Init - HMODULE preloaded_plugin_module_; + base::NativeLibrary preloaded_plugin_module_; // Points to the plugin file that this process hosts. FilePath plugin_path_; |