| Index: content/child/resource_dispatcher.h
|
| diff --git a/content/child/resource_dispatcher.h b/content/child/resource_dispatcher.h
|
| index e4a2d4f6c61d418ea2f8122504e8cfc4cf9e0b64..d1ca189b9c8509b4709dfc00ec5df63232893d9d 100644
|
| --- a/content/child/resource_dispatcher.h
|
| +++ b/content/child/resource_dispatcher.h
|
| @@ -18,12 +18,18 @@
|
| #include "content/common/content_export.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "ipc/ipc_sender.h"
|
| -#include "webkit/child/resource_loader_bridge.h"
|
| +#include "net/base/request_priority.h"
|
| #include "webkit/common/resource_type.h"
|
|
|
| struct ResourceMsg_RequestCompleteData;
|
|
|
| +namespace webkit_glue {
|
| +class ResourceLoaderBridge;
|
| +struct ResourceResponseInfo;
|
| +}
|
| +
|
| namespace content {
|
| +class RequestDelegatePeer;
|
| class ResourceDispatcherDelegate;
|
| struct RequestInfo;
|
| struct ResourceResponseHead;
|
| @@ -48,7 +54,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
|
|
|
| // Adds a request from the pending_requests_ list, returning the new
|
| // requests' ID
|
| - int AddPendingRequest(webkit_glue::ResourceLoaderBridge::Peer* callback,
|
| + int AddPendingRequest(RequestDelegatePeer* callback,
|
| ResourceType::Type resource_type,
|
| int origin_pid,
|
| const GURL& frame_origin,
|
| @@ -90,7 +96,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
|
| struct PendingRequestInfo {
|
| PendingRequestInfo();
|
|
|
| - PendingRequestInfo(webkit_glue::ResourceLoaderBridge::Peer* peer,
|
| + PendingRequestInfo(RequestDelegatePeer* peer,
|
| ResourceType::Type resource_type,
|
| int origin_pid,
|
| const GURL& frame_origin,
|
| @@ -98,7 +104,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
|
|
|
| ~PendingRequestInfo();
|
|
|
| - webkit_glue::ResourceLoaderBridge::Peer* peer;
|
| + RequestDelegatePeer* peer;
|
| ResourceType::Type resource_type;
|
| // The PID of the original process which issued this request. This gets
|
| // non-zero only for a request proxied by another renderer, particularly
|
|
|