summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_view_impl.cc
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-22 18:31:42 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-22 18:31:42 +0000
commit756fbde6911d40d376680c7ab9b576620f64c108 (patch)
treedb279a9daa90a0842a5eb035ffd6ec796ae851d2 /content/renderer/render_view_impl.cc
parent3b06f2ae871249581d6b4aeb47921f102b638156 (diff)
downloadchromium_src-756fbde6911d40d376680c7ab9b576620f64c108.zip
chromium_src-756fbde6911d40d376680c7ab9b576620f64c108.tar.gz
chromium_src-756fbde6911d40d376680c7ab9b576620f64c108.tar.bz2
Move webkitplatformsupport_impl and related from glue to child
Picking up Ananta's change. Move the webkitplatformsupport_impl.cc/.h files out of webkit\glue to webkit\child. This requires moving the following files out of webkit\glue to webkit\child: 1. weburlloader_impl.cc/.h 2. weburlrequest_extradata_impl.cc/.h 3. websocketstreamhandle_impl.cc/.h 4. weburlresponse_extradata_impl.cc/.h 5. websocketstreamhandle_delegate.h 6. ftp_directory_listing_response_delegate.cc/.h 7. multipart_response_delegate.cc/.h 8. multipart_response_delegate_unittest.cc 9. resource_loader_bridge.cc/.h The following files have been moved to webkit\common: 2. resource_type.cc/.h Move MemoryUsageKB out of webkit_glue.cc/h to webkit/child/webkit_child_helpers. I added an include rule to content\common\DEPS to allow including webkit\child\websocketstreamhandle_delegate.h. This will be removed in a followup. TBR=jam@chromium.org, jamesr@chromium.org, jschuh@chromium.org BUG=237249 Review URL: https://codereview.chromium.org/19673002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.cc')
-rw-r--r--content/renderer/render_view_impl.cc36
1 files changed, 18 insertions, 18 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 288b405..3d5d7f8 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -139,6 +139,22 @@
#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/public/web/WebAccessibilityObject.h"
#include "third_party/WebKit/public/web/WebColorName.h"
#include "third_party/WebKit/public/web/WebDOMEvent.h"
@@ -181,22 +197,6 @@
#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/public/web/WebWindowFeatures.h"
#include "third_party/WebKit/public/web/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 "ui/base/ui_base_switches_util.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/point.h"
@@ -205,9 +205,9 @@
#include "ui/gfx/size_conversions.h"
#include "ui/shell_dialogs/selected_file_info.h"
#include "v8/include/v8.h"
+#include "webkit/child/weburlresponse_extradata_impl.h"
#include "webkit/common/dom_storage/dom_storage_types.h"
#include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/weburlresponse_extradata_impl.h"
#include "webkit/renderer/appcache/web_application_cache_host_impl.h"
#include "webkit/renderer/webpreferences_renderer.h"
@@ -225,9 +225,9 @@
#include "content/renderer/media/android/webmediaplayer_android.h"
#include "content/renderer/media/android/webmediaplayer_proxy_android.h"
#include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/public/web/WebHitTestResult.h"
#include "third_party/WebKit/public/platform/WebFloatPoint.h"
#include "third_party/WebKit/public/platform/WebFloatRect.h"
+#include "third_party/WebKit/public/web/WebHitTestResult.h"
#include "ui/gfx/rect_f.h"
#if defined(GOOGLE_TV)