render_view.h: Header cleanup.

BUG=none
TEST=none

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

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

13 files changed, 45 insertions, 26 deletions

diff --git a/chrome/renderer/autofill_helper.cc b/chrome/renderer/autofill_helper.cc
index 2c6d6c8..698a3b342d 100644
--- a/chrome/renderer/autofill_helper.cc
+++ b/chrome/renderer/autofill_helper.cc
@@ -11,6 +11,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/password_form.h"
 
 using WebKit::WebFormControlElement;
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 01c66e4..44513f5 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -15,6 +15,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsMessageData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/devtools_message_data.h"
 #include "webkit/glue/webkit_glue.h"
 
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index b1b7565..52f5d0e 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -10,6 +10,7 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
+#include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
@@ -20,6 +21,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 
 using bindings_utils::CallFunctionInContext;
 using bindings_utils::ContextInfo;
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 5e99f80..828aabc 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -27,6 +27,7 @@
 #include "chrome/renderer/user_script_slave.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
+#include "chrome/renderer/render_view_visitor.h"
 #include "grit/common_resources.h"
 #include "grit/renderer_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -35,6 +36,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 
 using bindings_utils::GetStringResource;
 using bindings_utils::ContextInfo;
diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc
index 7b34437..8a1b6ec 100644
--- a/chrome/renderer/external_extension.cc
+++ b/chrome/renderer/external_extension.cc
@@ -8,6 +8,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/renderer/render_view.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+#include "v8/include/v8.h"
 
 using WebKit::WebFrame;
 using WebKit::WebView;
diff --git a/chrome/renderer/notification_provider.cc b/chrome/renderer/notification_provider.cc
index 46e8cab..d46ab67 100644
--- a/chrome/renderer/notification_provider.cc
+++ b/chrome/renderer/notification_provider.cc
@@ -14,6 +14,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 
 using WebKit::WebDocument;
 using WebKit::WebNotification;
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index ef0dd14..cede085 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -17,6 +17,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 
 using printing::ConvertPixelsToPoint;
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 5a0ac80..14bb3a0 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -76,6 +76,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/extensions/v8/benchmarking_extension.h"
 #include "webkit/extensions/v8/gears_extension.h"
 #include "webkit/extensions/v8/interval_extension.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index a1147dd..820ce97c 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -57,6 +57,7 @@
 #include "chrome/renderer/print_web_view_helper.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
+#include "chrome/renderer/render_view_visitor.h"
 #include "chrome/renderer/renderer_webapplicationcachehost_impl.h"
 #include "chrome/renderer/renderer_webstoragenamespace_impl.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
@@ -69,6 +70,8 @@
 #include "gfx/color_utils.h"
 #include "gfx/favicon_size.h"
 #include "gfx/native_widget_types.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "net/base/data_url.h"
@@ -79,6 +82,7 @@
 #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityCache.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
@@ -113,6 +117,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebWindowFeatures.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/glue/dom_operations.h"
@@ -120,9 +125,11 @@
 #include "webkit/glue/form_field.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/image_decoder.h"
+#include "webkit/glue/image_resource_fetcher.h"
 #include "webkit/glue/media/buffered_data_source.h"
 #include "webkit/glue/media/simple_data_source.h"
 #include "webkit/glue/media/video_renderer_impl.h"
+#include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/plugins/default_plugin_shared.h"
 #include "webkit/glue/plugins/pepper_webplugin_impl.h"
 #include "webkit/glue/plugins/plugin_list.h"
@@ -529,6 +536,10 @@ void RenderView::SetNextPageID(int32 next_page_id) {
   next_page_id_ = next_page_id;
 }
 
+WebKit::WebView* RenderView::webview() const{
+  return static_cast<WebKit::WebView*>(webwidget());
+}
+
 void RenderView::UserMetricsRecordAction(const std::string& action) {
   Send(new ViewHostMsg_UserMetricsRecordAction(routing_id_, action));
 }
@@ -4372,8 +4383,8 @@ void RenderView::OnSetWindowVisibility(bool visible) {
   }
 }
 
-void RenderView::OnWindowFrameChanged(gfx::Rect window_frame,
-                                      gfx::Rect view_frame) {
+void RenderView::OnWindowFrameChanged(const gfx::Rect& window_frame,
+                                      const gfx::Rect& view_frame) {
   // Inform plugins that their window's frame has changed.
   std::set<WebPluginDelegateProxy*>::iterator plugin_it;
   for (plugin_it = plugin_delegates_.begin();
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 8aff5ea..d3b0d7a 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -14,55 +14,35 @@
 
 #include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
-#include "base/file_path.h"
-#include "base/id_map.h"
 #include "base/linked_ptr.h"
-#include "base/shared_memory.h"
 #include "base/timer.h"
-#include "base/values.h"
 #include "base/weak_ptr.h"
 #include "build/build_config.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/edit_command.h"
 #include "chrome/common/navigation_gesture.h"
-#include "chrome/common/notification_type.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/renderer_preferences.h"
-#include "chrome/common/translate_errors.h"
 #include "chrome/common/view_types.h"
 #include "chrome/renderer/autofill_helper.h"
 #include "chrome/renderer/automation/dom_automation_controller.h"
 #include "chrome/renderer/dom_ui_bindings.h"
-#include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/external_host_bindings.h"
-#include "chrome/renderer/notification_provider.h"
 #include "chrome/renderer/password_autocomplete_manager.h"
 #include "chrome/renderer/pepper_plugin_delegate_impl.h"
 #include "chrome/renderer/render_widget.h"
-#include "chrome/renderer/render_view_visitor.h"
 #include "chrome/renderer/renderer_webcookiejar_impl.h"
 #include "chrome/renderer/translate_helper.h"
-#include "gfx/point.h"
-#include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPageSerializerClient.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNavigationType.h"
-#include "webkit/glue/form_data.h"
-#include "webkit/glue/image_resource_fetcher.h"
-#include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/plugins/webplugin_page_delegate.h"
-#include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webpreferences.h"
 
 #if defined(OS_WIN)
@@ -81,8 +61,10 @@ class GeolocationDispatcher;
 class GURL;
 class ListValue;
 class NavigationState;
+class NotificationProvider;
 class PepperDeviceTest;
 class PrintWebViewHelper;
+class RenderViewVisitor;
 class SkBitmap;
 class WebPluginDelegatePepper;
 class WebPluginDelegateProxy;
@@ -96,12 +78,21 @@ namespace base {
 class WaitableEvent;
 }
 
+namespace gfx {
+class Point;
+class Rect;
+}
+
 namespace webkit_glue {
+class ImageResourceFetcher;
 struct FileUploadData;
+struct FormData;
+struct PasswordFormFillData;
 }
 
 namespace WebKit {
 class WebAccessibilityCache;
+class WebAccessibilityObject;
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebDataSource;
@@ -113,11 +104,15 @@ class WebInputElement;
 class WebKeyboardEvent;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
+class WebNode;
 class WebPlugin;
 class WebStorageNamespace;
 class WebURLRequest;
+class WebView;
+struct WebContextMenuData;
 struct WebFileChooserParams;
 struct WebFindOptions;
+struct WebPluginParams;
 struct WebPoint;
 struct WebWindowFeatures;
 }
@@ -175,9 +170,7 @@ class RenderView : public RenderWidget,
   static void SetNextPageID(int32 next_page_id);
 
   // May return NULL when the view is closing.
-  WebKit::WebView* webview() const {
-    return static_cast<WebKit::WebView*>(webwidget());
-  }
+  WebKit::WebView* webview() const;
 
   int browser_window_id() const {
     return browser_window_id_;
@@ -820,7 +813,8 @@ class RenderView : public RenderWidget,
   void OnUpdateTargetURLAck();
   void OnUpdateWebPreferences(const WebPreferences& prefs);
 #if defined(OS_MACOSX)
-  void OnWindowFrameChanged(gfx::Rect window_frame, gfx::Rect view_frame);
+  void OnWindowFrameChanged(const gfx::Rect& window_frame,
+                            const gfx::Rect& view_frame);
 #endif
   void OnZoom(PageZoom::Function function);
 
diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc
index 47d99f1..315851f 100644
--- a/chrome/renderer/render_view_unittest.cc
+++ b/chrome/renderer/render_view_unittest.cc
@@ -21,6 +21,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 
diff --git a/chrome/renderer/renderer_webapplicationcachehost_impl.cc b/chrome/renderer/renderer_webapplicationcachehost_impl.cc
index c4b6e71..f5bad0c 100644
--- a/chrome/renderer/renderer_webapplicationcachehost_impl.cc
+++ b/chrome/renderer/renderer_webapplicationcachehost_impl.cc
@@ -8,6 +8,7 @@
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 
 using appcache::AppCacheBackend;
 using WebKit::WebApplicationCacheHostClient;
diff --git a/chrome/renderer/translate_helper.cc b/chrome/renderer/translate_helper.cc
index 4f5c89b..48cab3f 100644
--- a/chrome/renderer/translate_helper.cc
+++ b/chrome/renderer/translate_helper.cc
@@ -9,6 +9,8 @@
 #include "chrome/renderer/render_view.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
+#include "v8/include/v8.h"
 
 using WebKit::WebFrame;
 using WebKit::WebScriptSource;