summaryrefslogtreecommitdiffstats
path: root/content/public/browser/resource_request_info.h
diff options
context:
space:
mode:
authorbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-22 18:56:10 +0000
committerbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-22 18:56:10 +0000
commit34404b66acf8b88ed094f2492069c299fc7fd1a1 (patch)
tree8d904da942e8edc12c6cdf81dbb6839649afadce /content/public/browser/resource_request_info.h
parentbd0690ee89bf3843fdb0ac3a0154fde687595f1a (diff)
downloadchromium_src-34404b66acf8b88ed094f2492069c299fc7fd1a1.zip
chromium_src-34404b66acf8b88ed094f2492069c299fc7fd1a1.tar.gz
chromium_src-34404b66acf8b88ed094f2492069c299fc7fd1a1.tar.bz2
Revert 212927 "Move webkitplatformsupport_impl and related from ..."
> 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 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/19888003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/browser/resource_request_info.h')
-rw-r--r--content/public/browser/resource_request_info.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/public/browser/resource_request_info.h b/content/public/browser/resource_request_info.h
index 6952975..76dfc48 100644
--- a/content/public/browser/resource_request_info.h
+++ b/content/public/browser/resource_request_info.h
@@ -9,7 +9,7 @@
#include "content/common/content_export.h"
#include "content/public/common/page_transition_types.h"
#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
namespace net {
class URLRequest;