diff options
Diffstat (limited to 'webkit/child/resource_loader_bridge.h')
-rw-r--r-- | webkit/child/resource_loader_bridge.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/webkit/child/resource_loader_bridge.h b/webkit/child/resource_loader_bridge.h index efe8b77..fb6cf09 100644 --- a/webkit/child/resource_loader_bridge.h +++ b/webkit/child/resource_loader_bridge.h @@ -28,35 +28,20 @@ #include "net/base/request_priority.h" #include "url/gurl.h" #include "webkit/child/webkit_child_export.h" -#include "webkit/common/resource_response_info.h" // TODO(pilgrim) remove this once resource loader is moved to content // http://crbug.com/338338 namespace content { class ResourceRequestBody; +struct SyncLoadResponse; } namespace webkit_glue { +struct ResourceResponseInfo; + class ResourceLoaderBridge { public: - // See the SyncLoad method declared below. (The name of this struct is not - // suffixed with "Info" because it also contains the response data.) - struct SyncLoadResponse : ResourceResponseInfo { - WEBKIT_CHILD_EXPORT SyncLoadResponse(); - WEBKIT_CHILD_EXPORT ~SyncLoadResponse(); - - // The response error code. - int error_code; - - // The final URL of the response. This may differ from the request URL in - // the case of a server redirect. - GURL url; - - // The response data. - std::string data; - }; - // Generated by the bridge. This is implemented by our custom resource loader // within webkit. The Peer and it's bridge should have identical lifetimes // as they represent each end of a communication channel. @@ -156,7 +141,7 @@ class ResourceLoaderBridge { // use this if you really need it! There is also no way for the caller to // interrupt this method. Errors are reported via the status field of the // response parameter. - virtual void SyncLoad(SyncLoadResponse* response) = 0; + virtual void SyncLoad(content::SyncLoadResponse* response) = 0; protected: // Construction must go through |