summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authordspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-15 21:20:23 +0000
committerdspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-15 21:20:23 +0000
commit1d3afeaeea04c5545883ce9bfd47b5686d41b73f (patch)
treeb92b4ab943973edcf4ccddeacd85b4895e3bc476 /gpu
parente00e18af2f61e8eec071778f66ef15e8bf671d42 (diff)
downloadchromium_src-1d3afeaeea04c5545883ce9bfd47b5686d41b73f.zip
chromium_src-1d3afeaeea04c5545883ce9bfd47b5686d41b73f.tar.gz
chromium_src-1d3afeaeea04c5545883ce9bfd47b5686d41b73f.tar.bz2
Remove redundant nphostapi.h from webkit/glue/plugins, update source files as
needed. Note that this change is required for the Native Client SDK, because comman_buffer_pepper.h erroneously references nphostpis.h from webkit/glue. BUG=none TEST=none Review URL: http://codereview.chromium.org/1000001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/demos/framework/main_pepper.cc2
-rw-r--r--gpu/demos/framework/plugin.h2
-rw-r--r--gpu/gpu_plugin/gpu_plugin.cc2
-rw-r--r--gpu/pgl/command_buffer_pepper.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/gpu/demos/framework/main_pepper.cc b/gpu/demos/framework/main_pepper.cc
index cf8f510..ae28fcc 100644
--- a/gpu/demos/framework/main_pepper.cc
+++ b/gpu/demos/framework/main_pepper.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "gpu/demos/framework/plugin.h"
#include "gpu/pgl/pgl.h"
-#include "webkit/glue/plugins/nphostapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
#if __GNUC__ >= 4
#define EXPORT __attribute__ ((visibility("default")))
diff --git a/gpu/demos/framework/plugin.h b/gpu/demos/framework/plugin.h
index 640d9c0..94910ff 100644
--- a/gpu/demos/framework/plugin.h
+++ b/gpu/demos/framework/plugin.h
@@ -9,7 +9,7 @@
#include "base/scoped_ptr.h"
#include "gpu/demos/framework/demo.h"
#include "gpu/pgl/pgl.h"
-#include "webkit/glue/plugins/nphostapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
namespace gpu {
namespace demos {
diff --git a/gpu/gpu_plugin/gpu_plugin.cc b/gpu/gpu_plugin/gpu_plugin.cc
index d274936..bdec53d 100644
--- a/gpu/gpu_plugin/gpu_plugin.cc
+++ b/gpu/gpu_plugin/gpu_plugin.cc
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "build/build_config.h"
#include "gpu/gpu_plugin/gpu_plugin.h"
-#include "webkit/glue/plugins/nphostapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
namespace gpu_plugin {
diff --git a/gpu/pgl/command_buffer_pepper.h b/gpu/pgl/command_buffer_pepper.h
index 3719e39..e75d7bf 100644
--- a/gpu/pgl/command_buffer_pepper.h
+++ b/gpu/pgl/command_buffer_pepper.h
@@ -12,7 +12,7 @@
#ifdef __native_client__
#include "native_client/src/third_party/npapi/files/include/npupp.h"
#else
-#include "webkit/glue/plugins/nphostapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
#endif // __native_client__
// A CommandBuffer proxy implementation that uses the Pepper API to access