Fix a bunch of include problems that my deps checker tool found. Mostly I made the names of some third party includes fully qualified. I removed a qualification on a couple of the WebKit port includes that confuses it and isn't necessary (since WebKit includes aren't fully qualified).

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@604 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 8 insertions, 8 deletions

diff --git a/webkit/glue/cpp_variant.h b/webkit/glue/cpp_variant.h
index 5e57a51..e8843af 100644
--- a/webkit/glue/cpp_variant.h
+++ b/webkit/glue/cpp_variant.h
@@ -47,7 +47,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 class CppVariant : public NPVariant {
  public:
diff --git a/webkit/glue/npruntime_util.cc b/webkit/glue/npruntime_util.cc
index 5c0ec96..327ee0c 100644
--- a/webkit/glue/npruntime_util.cc
+++ b/webkit/glue/npruntime_util.cc
@@ -35,7 +35,7 @@
 #if USE(V8_BINDING)
 #include "webkit/port/bindings/v8/np_v8object.h"
 #elif USE(JAVASCRIPTCORE_BINDINGS)
-#include "bindings/c/c_utility.h"
+#include "third_party/npapi/bindings/c/c_utility.h"
 using KJS::Bindings::PrivateIdentifier;
 #endif
 
diff --git a/webkit/glue/plugins/nphostapi.h b/webkit/glue/plugins/nphostapi.h
index a248fd6..f3b83eb 100644
--- a/webkit/glue/plugins/nphostapi.h
+++ b/webkit/glue/plugins/nphostapi.h
@@ -32,8 +32,8 @@
 #ifndef WEBKIT_GLUE_PLUGIN_NPHOSTAPI_H__
 #define WEBKIT_GLUE_PLUGIN_NPHOSTAPI_H__
 
-#include "bindings/npapi.h"
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 #ifdef __cplusplus
 extern "C" { 
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index cdfe972..64b79de 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -93,7 +93,6 @@
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "FrameWin.h"
-#include "graphics/SkiaUtils.h"
 #include "GraphicsContext.h"
 #include "HTMLHeadElement.h"
 #include "HTMLLinkElement.h"
@@ -110,10 +109,11 @@
 #include "ResourceRequest.h"
 #include "SelectionController.h"
 #include "Settings.h"
+#include "SkiaUtils.h"
 #include "SubstituteData.h"
 #include "TextIterator.h"
 #include "TextAffinity.h"
-#include "xml/XPathResult.h"
+#include "XPathResult.h"
 
 #pragma warning(pop)
 
diff --git a/webkit/glue/webplugin_delegate.h b/webkit/glue/webplugin_delegate.h
index 43ab88c..996fa8e 100644
--- a/webkit/glue/webplugin_delegate.h
+++ b/webkit/glue/webplugin_delegate.h
@@ -34,7 +34,7 @@
 
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
-#include "bindings/npapi.h"
+#include "third_party/npapi/bindings/npapi.h"
 
 typedef struct HDC__* HDC;
 
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc
index 010d9f0..70dc0a1 100644
--- a/webkit/glue/webwidget_impl.cc
+++ b/webkit/glue/webwidget_impl.cc
@@ -37,6 +37,7 @@
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
 #include "PlatformWheelEvent.h"
+#include "SkiaUtils.h"
 #pragma warning(pop)
 
 #undef LOG
@@ -47,7 +48,6 @@
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget_delegate.h"
 #include "webkit/glue/webwidget_impl.h"
-#include "graphics/SkiaUtils.h"
 
 using namespace WebCore;