summaryrefslogtreecommitdiffstats
path: root/webkit/glue/weburlrequest_impl.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-22 19:57:35 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-22 19:57:35 +0000
commit477949abb137a50831dae7b1ef4b36b3295a6044 (patch)
tree136cb053bf67cd5aeaa05eb0f766abf5aaa32994 /webkit/glue/weburlrequest_impl.h
parent3fbdd8ed521d99cf94ef387321ea34cecf853a5e (diff)
downloadchromium_src-477949abb137a50831dae7b1ef4b36b3295a6044.zip
chromium_src-477949abb137a50831dae7b1ef4b36b3295a6044.tar.gz
chromium_src-477949abb137a50831dae7b1ef4b36b3295a6044.tar.bz2
Make WebRequest be a wrapper for ResourceRequest instead of FrameLoadRequest.
It turns out that no one was ever reading the frameName field, so this change is quite trivial. BUG=10038 TEST=none R=brettw Review URL: http://codereview.chromium.org/115713 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/weburlrequest_impl.h')
-rw-r--r--webkit/glue/weburlrequest_impl.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/webkit/glue/weburlrequest_impl.h b/webkit/glue/weburlrequest_impl.h
index aa4524a..207fbc3 100644
--- a/webkit/glue/weburlrequest_impl.h
+++ b/webkit/glue/weburlrequest_impl.h
@@ -5,13 +5,9 @@
#ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H_
#define WEBKIT_GLUE_WEBURLREQUEST_IMPL_H_
-#include "base/compiler_specific.h"
#include "webkit/glue/weburlrequest.h"
-MSVC_PUSH_WARNING_LEVEL(0);
-#include "FrameLoadRequest.h"
-#include "HistoryItem.h"
-MSVC_POP_WARNING();
+#include "ResourceRequest.h"
class WebRequestImpl : public WebRequest {
public:
@@ -19,7 +15,6 @@ class WebRequestImpl : public WebRequest {
explicit WebRequestImpl(const GURL& url);
explicit WebRequestImpl(const WebCore::ResourceRequest& request);
- explicit WebRequestImpl(const WebCore::FrameLoadRequest& request);
// WebRequest
virtual WebRequest* Clone() const;
@@ -45,15 +40,15 @@ class WebRequestImpl : public WebRequest {
virtual void SetRequestorID(int requestor_id);
// WebRequestImpl
- const WebCore::FrameLoadRequest& frame_load_request() const {
+ const WebCore::ResourceRequest& resource_request() const {
return request_;
}
- void set_frame_load_request(const WebCore::FrameLoadRequest& request) {
+ void set_resource_request(const WebCore::ResourceRequest& request) {
request_ = request;
}
protected:
- WebCore::FrameLoadRequest request_;
+ WebCore::ResourceRequest request_;
};
#endif // #ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H_