summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authordspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 20:17:41 +0000
committerdspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 20:17:41 +0000
commitcb8fcc20e76ec31ee6da0e740945b534c0d9273e (patch)
treef31cb32b3c935900ec2b00ce522d4499dc01ca5b /third_party
parente8c729aac97f4059a8bf7c2e880aceb9eb683e12 (diff)
downloadchromium_src-cb8fcc20e76ec31ee6da0e740945b534c0d9273e.zip
chromium_src-cb8fcc20e76ec31ee6da0e740945b534c0d9273e.tar.gz
chromium_src-cb8fcc20e76ec31ee6da0e740945b534c0d9273e.tar.bz2
Minor tweaks to get the NaCl tool-chain to build with the latest GPU stuff.
BUG=none TEST=none (Build the NaCl tool chain). Review URL: http://codereview.chromium.org/741001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/npapi/bindings/npapi_extensions.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/third_party/npapi/bindings/npapi_extensions.h b/third_party/npapi/bindings/npapi_extensions.h
index 05526d1..1f18a10 100644
--- a/third_party/npapi/bindings/npapi_extensions.h
+++ b/third_party/npapi/bindings/npapi_extensions.h
@@ -6,7 +6,9 @@
#ifndef _NP_EXTENSIONS_H_
#define _NP_EXTENSIONS_H_
-#include "third_party/npapi/bindings/npapi.h"
+// Use the shorter include path here so that this file can be used in non-
+// Chromium projects, such as the Native Client SDK.
+#include "npapi.h"
/*
* A fake "enum" value for getting Pepper extensions.
@@ -34,7 +36,7 @@ typedef enum {
NPThemeItemScrollbarHorizontalThumb = 4,
NPThemeItemScrollbarVerticalThumb = 5,
NPThemeItemScrollbarHoriztonalTrack = 6,
- NPThemeItemScrollbarVerticalTrack = 7,
+ NPThemeItemScrollbarVerticalTrack = 7
} NPThemeItem;
typedef enum {
@@ -46,7 +48,7 @@ typedef enum {
// it to NPThemeStateNormal if on other platforms or on Windows XP.
NPThemeStateHover = 2,
NPThemeStateNormal = 3,
- NPThemeStatePressed = 4,
+ NPThemeStatePressed = 4
} NPThemeState;
typedef struct _NPThemeParams {