diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 19:30:08 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-14 19:30:08 +0000 |
| commit | efbac100e18d55257040248dca9592e9f6bea67d (patch) | |
| tree | 4c29f3adabdcf3380c0f4d818bb11a0c4e9915a4 | |
| parent | 1dfa6aa6e1c0bb2e6208c9dbb1ba6572d4b077de (diff) | |
| download | chromium_src-efbac100e18d55257040248dca9592e9f6bea67d.zip chromium_src-efbac100e18d55257040248dca9592e9f6bea67d.tar.gz chromium_src-efbac100e18d55257040248dca9592e9f6bea67d.tar.bz2 | |
Revert "wrap HMODULE with ifdefs for right now to compile on linux"
TBR=tony
Review URL: http://codereview.chromium.org/7146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3360 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/glue/plugins/plugin_lib.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h index d9d52f5..a0a6a82 100644 --- a/webkit/glue/plugins/plugin_lib.h +++ b/webkit/glue/plugins/plugin_lib.h @@ -5,8 +5,6 @@ #ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_LIB_H__ #define WEBKIT_GLUE_PLUGIN_PLUGIN_LIB_H__ -#include "build/build_config.h" - #include <string> #include "base/basictypes.h" @@ -85,12 +83,10 @@ class PluginLib : public base::RefCounted<PluginLib> { // NPAPI method to shutdown a Plugin. void NP_Shutdown(void); -#if defined(OS_WIN) // Helper function to load a plugin. // Returns the module handle on success. static HMODULE LoadPluginHelper(const std::wstring plugin_file); -#endif - + int instance_count() const { return instance_count_; } private: @@ -119,9 +115,7 @@ class PluginLib : public base::RefCounted<PluginLib> { bool internal_; // Whether this an internal plugin. scoped_ptr<WebPluginInfo> web_plugin_info_; // supported mime types, description -#if defineed(OS_WIN) HMODULE module_; // the opened DLL handle -#endif NPPluginFuncs plugin_funcs_; // the struct of plugin side functions bool initialized_; // is the plugin initialized NPSavedData *saved_data_; // persisted plugin info for NPAPI |