Header cleanup in webkit/glue

- reduce header dependencies
- remove redundant forward declarations

Review URL: http://codereview.chromium.org/115871

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

27 files changed, 21 insertions, 26 deletions

diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index 2ab9e20..257a5aaa 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/file_path.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
diff --git a/webkit/glue/back_forward_list_client_impl.h b/webkit/glue/back_forward_list_client_impl.h
index 45ad379..85f08fc 100644
--- a/webkit/glue/back_forward_list_client_impl.h
+++ b/webkit/glue/back_forward_list_client_impl.h
@@ -7,8 +7,6 @@
 
 #include "BackForwardList.h"
 
-#include "base/ref_counted.h"
-
 class WebViewImpl;
 
 namespace webkit_glue {
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index 6e8b817..4b6ab72 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -38,6 +38,7 @@ MSVC_POP_WARNING();
 #include "googleurl/src/gurl.h"
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/WebKit.h"
+#include "webkit/api/public/WebRect.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/webkit/glue/debugger_bridge.cc b/webkit/glue/debugger_bridge.cc
index 77a4c43..ab3c37e 100644
--- a/webkit/glue/debugger_bridge.cc
+++ b/webkit/glue/debugger_bridge.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "config.h"  // webkit config for V8
+#include "base/message_loop.h"
 #include "base/string_util.h"
 #include "webkit/glue/debugger_bridge.h"
 
diff --git a/webkit/glue/debugger_bridge.h b/webkit/glue/debugger_bridge.h
index f4bd160..519ca21 100644
--- a/webkit/glue/debugger_bridge.h
+++ b/webkit/glue/debugger_bridge.h
@@ -11,10 +11,11 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "v8/include/v8-debug.h"
 
+class MessageLoop;
+
 void V8DebugMessageHandler(const uint16_t* message, int length,
                            v8::Debug::ClientData* client_data);
 
diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc
index eb38ab6..d672881 100644
--- a/webkit/glue/devtools/debugger_agent_impl.cc
+++ b/webkit/glue/devtools/debugger_agent_impl.cc
@@ -13,6 +13,7 @@
 #include "Page.h"
 #undef LOG
 
+#include "base/string_piece.h"
 #include "grit/webkit_resources.h"
 #include "V8Binding.h"
 #include "V8DOMWindow.h"
diff --git a/webkit/glue/dom_serializer_delegate.h b/webkit/glue/dom_serializer_delegate.h
index 278a3a7..7a738c4 100644
--- a/webkit/glue/dom_serializer_delegate.h
+++ b/webkit/glue/dom_serializer_delegate.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "googleurl/src/gurl.h"
+class GURL;
 
 namespace webkit_glue {
 
diff --git a/webkit/glue/entity_map.cc b/webkit/glue/entity_map.cc
index 1519b51..0654481 100644
--- a/webkit/glue/entity_map.cc
+++ b/webkit/glue/entity_map.cc
@@ -7,6 +7,7 @@
 #include "webkit/glue/entity_map.h"
 
 #include "base/hash_tables.h"
+#include "base/string_util.h"
 
 namespace webkit_glue {
 
diff --git a/webkit/glue/entity_map.h b/webkit/glue/entity_map.h
index 69c15b9..1b7e28b 100644
--- a/webkit/glue/entity_map.h
+++ b/webkit/glue/entity_map.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string_util.h"
+#include "base/string16.h"
 
 namespace webkit_glue {
 
diff --git a/webkit/glue/feed_preview.cc b/webkit/glue/feed_preview.cc
index 11ddf53..bea7197 100644
--- a/webkit/glue/feed_preview.cc
+++ b/webkit/glue/feed_preview.cc
@@ -16,6 +16,7 @@ MSVC_POP_WARNING();
 #undef LOG
 
 #include "base/logging.h"
+#include "base/string_piece.h"
 #include "grit/webkit_resources.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/glue_util.h"
diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index 813cd05..2d7ba77 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -21,7 +21,6 @@
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
-#include "base/file_path.h"
 #include "base/platform_file.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
@@ -35,6 +34,8 @@ namespace net {
 class HttpResponseHeaders;
 }
 
+class FilePath;
+
 namespace webkit_glue {
 
 class ResourceLoaderBridge {
diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h
index 8271974..cb65ae4 100644
--- a/webkit/glue/webframe.h
+++ b/webkit/glue/webframe.h
@@ -6,10 +6,11 @@
 #define WEBKIT_GLUE_WEBFRAME_H_
 
 #include "base/scoped_ptr.h"
-#include "googleurl/src/gurl.h"
+#include "base/string16.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/platform_canvas.h"
 
+class GURL;
 class WebAppCacheContext;
 class WebDataSource;
 class WebError;
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 718c91c..a21e401 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -56,6 +56,7 @@ MSVC_POP_WARNING();
 #include "webkit/glue/weberror_impl.h"
 #include "webkit/glue/webframeloaderclient_impl.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webplugin_impl.h"
 #include "webkit/glue/webresponse_impl.h"
 #include "webkit/glue/webview_delegate.h"
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index e49dc41..25cca45 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -5,8 +5,6 @@
 #ifndef WEBKIT_GLUE_WEBFRAMELOADERCLIENT_IMPL_H__
 #define WEBKIT_GLUE_WEBFRAMELOADERCLIENT_IMPL_H__
 
-#include <set>
-
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
@@ -15,7 +13,6 @@ MSVC_POP_WARNING();
 
 #include "build/build_config.h"
 #include "base/scoped_ptr.h"
-#include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/window_open_disposition.h"
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 0024fe1..2fa9e4b 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -16,12 +16,11 @@
 
 #include "base/clipboard.h"
 #include "base/file_path.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/string16.h"
-#include "base/string_piece.h"
 
 class GURL;
 class SkBitmap;
+class StringPiece;
 class WebView;
 class WebFrame;
 struct WebPluginInfo;
diff --git a/webkit/glue/webplugin.h b/webkit/glue/webplugin.h
index 354dd73..00e60e7 100644
--- a/webkit/glue/webplugin.h
+++ b/webkit/glue/webplugin.h
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/file_path.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/native_widget_types.h"
 
diff --git a/webkit/glue/webplugin_delegate.h b/webkit/glue/webplugin_delegate.h
index eef7b9d..ec42432 100644
--- a/webkit/glue/webplugin_delegate.h
+++ b/webkit/glue/webplugin_delegate.h
@@ -6,7 +6,6 @@
 #define WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_
 
 #include <string>
-#include <vector>
 
 #include "base/gfx/native_widget_types.h"
 #include "third_party/npapi/bindings/npapi.h"
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 0441000..11f629d 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -63,6 +63,7 @@
 #include "webkit/glue/plugins/plugin_host.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/stacking_order_iterator.h"
+#include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webview_impl.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h
index 8d14792..f4464ac 100644
--- a/webkit/glue/webplugin_impl.h
+++ b/webkit/glue/webplugin_impl.h
@@ -23,7 +23,6 @@ MSVC_POP_WARNING();
 #include "base/basictypes.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webplugin.h"
-#include "webkit/glue/webplugin_delegate.h"
 
 class WebFrameImpl;
 class WebPluginDelegate;
diff --git a/webkit/glue/weburlrequest.h b/webkit/glue/weburlrequest.h
index 31bc1cb..d26886a 100644
--- a/webkit/glue/weburlrequest.h
+++ b/webkit/glue/weburlrequest.h
@@ -8,8 +8,6 @@
 #include <map>
 #include <string>
 
-#include "base/ref_counted.h"
-
 enum WebRequestCachePolicy {
   WebRequestUseProtocolCachePolicy,
   WebRequestReloadIgnoringCacheData,
diff --git a/webkit/glue/webview.h b/webkit/glue/webview.h
index 2a9faec..deb3903 100644
--- a/webkit/glue/webview.h
+++ b/webkit/glue/webview.h
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
 #include "webkit/glue/webwidget.h"
 
 namespace WebKit {
diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h
index 6be9b43..3d91eb0 100644
--- a/webkit/glue/webview_delegate.h
+++ b/webkit/glue/webview_delegate.h
@@ -28,7 +28,6 @@
 
 #include <vector>
 
-#include "base/file_path.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webwidget_delegate.h"
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 53569ad..d1c262d 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -89,6 +89,7 @@ MSVC_POP_WARNING();
 #include "webkit/api/public/WebDragData.h"
 #include "webkit/api/public/WebInputEvent.h"
 #include "webkit/api/public/WebPoint.h"
+#include "webkit/api/public/WebRect.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/context_menu_client_impl.h"
 #include "webkit/glue/dom_operations.h"
@@ -914,7 +915,7 @@ void WebViewImpl::Close() {
       page_->mainFrame()->loader()->frameDetached();
     page_.reset();
   }
-  
+
   // Should happen after page_.reset().
   devtools_agent_.reset(NULL);
 
diff --git a/webkit/glue/webwidget_delegate.h b/webkit/glue/webwidget_delegate.h
index 9dc79b3..0e27374 100644
--- a/webkit/glue/webwidget_delegate.h
+++ b/webkit/glue/webwidget_delegate.h
@@ -5,7 +5,6 @@
 #ifndef WEBKIT_GLUE_WEBWIDGET_DELEGATE_H__
 #define WEBKIT_GLUE_WEBWIDGET_DELEGATE_H__
 
-#include <string>
 #include <vector>
 
 #include "base/gfx/native_widget_types.h"
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc
index f08e95d..c738cdf 100644
--- a/webkit/glue/webwidget_impl.cc
+++ b/webkit/glue/webwidget_impl.cc
@@ -22,6 +22,7 @@ MSVC_POP_WARNING();
 #include "base/logging.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebInputEvent.h"
+#include "webkit/api/public/WebRect.h"
 #include "webkit/glue/event_conversion.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webwidget_delegate.h"
diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h
index 0ff7b2f..6d889b0 100644
--- a/webkit/glue/webwidget_impl.h
+++ b/webkit/glue/webwidget_impl.h
@@ -6,11 +6,8 @@
 #define WEBKIT_GLUE_WEBWIDGET_IMPL_H__
 
 #include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "base/ref_counted.h"
-#include "base/gfx/native_widget_types.h"
 #include "webkit/api/public/WebPoint.h"
-#include "webkit/api/public/WebRect.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/glue/webwidget.h"
 
@@ -30,6 +27,7 @@ namespace WebKit {
 class WebKeyboardEvent;
 class WebMouseEvent;
 class WebMouseWheelEvent;
+class WebRect;
 }
 
 struct MenuItem;
diff --git a/webkit/glue/webworker_impl.h b/webkit/glue/webworker_impl.h
index 4477a2c..56ad124 100644
--- a/webkit/glue/webworker_impl.h
+++ b/webkit/glue/webworker_impl.h
@@ -9,13 +9,11 @@
 
 #if ENABLE(WORKERS)
 
-#include <vector>
 #include "ScriptExecutionContext.h"
 #include "WorkerObjectProxy.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
-class ScriptExecutionContext;
 class Strng;
 class WorkerThread;
 };