Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index d8e5923f26f68b89a910805fb024d62667b2e5e1..f03c700f40141e1a8b3f517e969128b782bbc6f4 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -87,10 +87,8 @@ |
#include "net/http/http_util.h" |
#include "ppapi/c/private/ppb_flash_net_connector.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" |
@@ -98,9 +96,7 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIntent.h" |
@@ -112,25 +108,29 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginDocument.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSearchableFormData.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaCallbacks.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "ui/base/javascript_message_type.h" |
#include "ui/gfx/native_widget_types.h" |
@@ -138,13 +138,13 @@ |
#include "ui/gfx/rect.h" |
#include "v8/include/v8.h" |
#include "webkit/appcache/web_application_cache_host_impl.h" |
+#include "webkit/forms/form_data.h" |
+#include "webkit/forms/form_field.h" |
+#include "webkit/forms/password_form_dom_manager.h" |
#include "webkit/glue/alt_error_page_resource_fetcher.h" |
#include "webkit/glue/context_menu.h" |
#include "webkit/glue/dom_operations.h" |
-#include "webkit/glue/form_data.h" |
-#include "webkit/glue/form_field.h" |
#include "webkit/glue/glue_serialize.h" |
-#include "webkit/glue/password_form_dom_manager.h" |
#include "webkit/glue/webdropdata.h" |
#include "webkit/glue/webkit_constants.h" |
#include "webkit/glue/webkit_glue.h" |
@@ -250,10 +250,10 @@ using content::RenderViewObserver; |
using content::RenderViewVisitor; |
using content::Referrer; |
using content::V8ValueConverter; |
+using webkit::forms::FormField; |
+using webkit::forms::PasswordForm; |
+using webkit::forms::PasswordFormDomManager; |
using webkit_glue::AltErrorPageResourceFetcher; |
-using webkit_glue::FormField; |
-using webkit_glue::PasswordForm; |
-using webkit_glue::PasswordFormDomManager; |
using webkit_glue::ResourceFetcher; |
//----------------------------------------------------------------------------- |