Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 2cce2e981ff35b7bbba395722015e4885fd31c13..292ba38d0331d6bd3bc925b35e068737bf72fe78 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -27,6 +27,7 @@ |
#include "base/strings/sys_string_conversions.h" |
#include "base/time.h" |
#include "base/utf_string_conversions.h" |
+#include "content/child/fileapi/webfilesystem_callback_adapters.h" |
#include "content/common/appcache/appcache_dispatcher.h" |
#include "content/common/child_thread.h" |
#include "content/common/clipboard_messages.h" |
@@ -44,7 +45,6 @@ |
#include "content/common/ssl_status_serialization.h" |
#include "content/common/view_messages.h" |
#include "content/common/webmessageportchannel_impl.h" |
-#include "content/common_child/fileapi/webfilesystem_callback_adapters.h" |
#include "content/public/common/bindings_policy.h" |
#include "content/public/common/content_client.h" |
#include "content/public/common/content_constants.h" |
@@ -131,22 +131,6 @@ |
#include "net/base/net_errors.h" |
#include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
#include "net/http/http_util.h" |
-#include "third_party/WebKit/public/platform/WebCString.h" |
-#include "third_party/WebKit/public/platform/WebDragData.h" |
-#include "third_party/WebKit/public/platform/WebFileSystemType.h" |
-#include "third_party/WebKit/public/platform/WebHTTPBody.h" |
-#include "third_party/WebKit/public/platform/WebImage.h" |
-#include "third_party/WebKit/public/platform/WebMessagePortChannel.h" |
-#include "third_party/WebKit/public/platform/WebPoint.h" |
-#include "third_party/WebKit/public/platform/WebRect.h" |
-#include "third_party/WebKit/public/platform/WebSize.h" |
-#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" |
-#include "third_party/WebKit/public/platform/WebString.h" |
-#include "third_party/WebKit/public/platform/WebURL.h" |
-#include "third_party/WebKit/public/platform/WebURLError.h" |
-#include "third_party/WebKit/public/platform/WebURLRequest.h" |
-#include "third_party/WebKit/public/platform/WebURLResponse.h" |
-#include "third_party/WebKit/public/platform/WebVector.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h" |
@@ -189,6 +173,22 @@ |
#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/default/WebRenderTheme.h" |
+#include "third_party/WebKit/public/platform/WebCString.h" |
+#include "third_party/WebKit/public/platform/WebDragData.h" |
+#include "third_party/WebKit/public/platform/WebFileSystemType.h" |
+#include "third_party/WebKit/public/platform/WebHTTPBody.h" |
+#include "third_party/WebKit/public/platform/WebImage.h" |
+#include "third_party/WebKit/public/platform/WebMessagePortChannel.h" |
+#include "third_party/WebKit/public/platform/WebPoint.h" |
+#include "third_party/WebKit/public/platform/WebRect.h" |
+#include "third_party/WebKit/public/platform/WebSize.h" |
+#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" |
+#include "third_party/WebKit/public/platform/WebString.h" |
+#include "third_party/WebKit/public/platform/WebURL.h" |
+#include "third_party/WebKit/public/platform/WebURLError.h" |
+#include "third_party/WebKit/public/platform/WebURLRequest.h" |
+#include "third_party/WebKit/public/platform/WebURLResponse.h" |
+#include "third_party/WebKit/public/platform/WebVector.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "third_party/skia/include/core/SkPicture.h" |
#include "ui/base/ui_base_switches_util.h" |
@@ -226,9 +226,9 @@ |
#include "content/renderer/android/phone_number_detector.h" |
#include "content/renderer/media/stream_texture_factory_impl_android.h" |
#include "content/renderer/media/webmediaplayer_proxy_impl_android.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" |
#include "third_party/WebKit/public/platform/WebFloatPoint.h" |
#include "third_party/WebKit/public/platform/WebFloatRect.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" |
#include "ui/gfx/rect_f.h" |
#include "webkit/renderer/media/android/webmediaplayer_android.h" |
#include "webkit/renderer/media/android/webmediaplayer_manager_android.h" |