diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-15 16:39:31 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-15 16:39:31 +0000 |
commit | 6e66e46982f98d7351b2e2a804e71d76fbaa1053 (patch) | |
tree | e964afef5cb4118112d7db60e5275aa8f86dad02 /chrome/plugin | |
parent | 3f96abd259a9b719df4122ced56cd276501417ee (diff) | |
download | chromium_src-6e66e46982f98d7351b2e2a804e71d76fbaa1053.zip chromium_src-6e66e46982f98d7351b2e2a804e71d76fbaa1053.tar.gz chromium_src-6e66e46982f98d7351b2e2a804e71d76fbaa1053.tar.bz2 |
Platform cleanup in common/ and even porting few files and unit tests.
Review URL: http://codereview.chromium.org/14420
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r-- | chrome/plugin/npobject_util.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/plugin/npobject_util.h b/chrome/plugin/npobject_util.h index 6de7ccc..cc9347e 100644 --- a/chrome/plugin/npobject_util.h +++ b/chrome/plugin/npobject_util.h @@ -7,7 +7,11 @@ #ifndef CHROME_PLUGIN_NPOBJECT_UTIL_H__ #define CHROME_PLUGIN_NPOBJECT_UTIL_H__ +#include "build/build_config.h" + +#if defined(OS_WIN) #include <windows.h> +#endif #include "chrome/plugin/npobject_stub.h" struct _NPVariant; @@ -43,6 +47,7 @@ void CreateNPVariantParam(const NPVariant& variant, NPVariant_Param* param, bool release); +#if defined(OS_WIN) // Creates an NPVariant from the marshalled object. void CreateNPVariant(const NPVariant_Param& param, PluginChannelBase* channel, @@ -55,6 +60,7 @@ void CreateNPVariant(const NPVariant_Param& param, // in-process). This avoids deadlocks when a plugin invokes javascript that // causes a message box to come up. HANDLE GetMessageBoxEvent(HWND hwnd); +#endif // defined(OS_WIN) #endif // CHROME_PLUGIN_NPOBJECT_UTIL_H__ |