summaryrefslogtreecommitdiffstats
path: root/chrome_frame
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 /chrome_frame
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 'chrome_frame')
-rw-r--r--chrome_frame/plugin_url_request.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/plugin_url_request.h b/chrome_frame/plugin_url_request.h
index 718741b..acfc49d 100644
--- a/chrome_frame/plugin_url_request.h
+++ b/chrome_frame/plugin_url_request.h
@@ -17,7 +17,7 @@
#include "net/base/host_port_pair.h"
#include "net/base/upload_data.h"
#include "net/url_request/url_request_status.h"
-#include "webkit/glue/resource_type.h"
+#include "webkit/common/resource_type.h"
class PluginUrlRequest;
class PluginUrlRequestDelegate;