diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-07 01:19:12 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-07 01:19:12 +0000 |
| commit | fccfc92e61a5e059a43595d30fd848f4bbe1d615 (patch) | |
| tree | 0037e939be4342393aecd5b9eef8d434a0c65734 /third_party | |
| parent | bfc484746ae3c89634e1a1cd2edf54ab8f31e1f5 (diff) | |
| download | chromium_src-fccfc92e61a5e059a43595d30fd848f4bbe1d615.zip chromium_src-fccfc92e61a5e059a43595d30fd848f4bbe1d615.tar.gz chromium_src-fccfc92e61a5e059a43595d30fd848f4bbe1d615.tar.bz2 | |
Add an Apple-ism (not present in Mozilla's version of NPAPI.h, but seemingly harmless) to our copy of npapi.h.
Change HTMLPlugInElement.cpp to use a function in eseidel's version of ScriptController.h.
TBR=ojan
Review URL: http://codereview.chromium.org/6521
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index 11f35ab..db74e55 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -525,6 +525,14 @@ typedef struct _NPPrint } print; } NPPrint; +// BEGIN GOOGLE MODIFICATIONS +#ifdef XP_MACOSX +typedef NPNSMenu NPMenu; +#else +typedef void * NPMenu; +#endif +// END GOOGLE MODIFICATIONS + #ifdef XP_MACOSX typedef EventRecord NPEvent; #elif defined(XP_WIN) |