| Index: content/browser/loader/resource_loader.h
|
| diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
|
| index 5b5ecdb500e62a820c04bb0a01dd5188f9c4187e..96619c694ff0fcd94c6012a9c9481c6711883ce5 100644
|
| --- a/content/browser/loader/resource_loader.h
|
| +++ b/content/browser/loader/resource_loader.h
|
| @@ -18,32 +18,36 @@
|
| #include "net/url_request/url_request.h"
|
|
|
| namespace net {
|
| class X509Certificate;
|
| }
|
|
|
| namespace content {
|
| class ResourceDispatcherHostLoginDelegate;
|
| class ResourceLoaderDelegate;
|
| class ResourceRequestInfoImpl;
|
| +class ResourceDispatcherHostDelegate;
|
| +class ResourceContext;
|
|
|
| // This class is responsible for driving the URLRequest (i.e., calling Start,
|
| // Read, and servicing events). It has a ResourceHandler, which is typically a
|
| // chain of ResourceHandlers, and is the ResourceController for its handler.
|
| class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| public SSLErrorHandler::Delegate,
|
| public SSLClientAuthHandler::Delegate,
|
| public ResourceController {
|
| public:
|
| ResourceLoader(scoped_ptr<net::URLRequest> request,
|
| scoped_ptr<ResourceHandler> handler,
|
| - ResourceLoaderDelegate* delegate);
|
| + ResourceLoaderDelegate* delegate,
|
| + ResourceDispatcherHostDelegate* host_delegate,
|
| + ResourceContext* resource_context);
|
| ~ResourceLoader() override;
|
|
|
| void StartRequest();
|
| void CancelRequest(bool from_renderer);
|
|
|
| bool is_transferring() const { return is_transferring_; }
|
| void MarkAsTransferring();
|
| void CompleteTransfer();
|
|
|
| net::URLRequest* request() { return request_.get(); }
|
| @@ -121,20 +125,22 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| DEFERRED_REDIRECT,
|
| DEFERRED_READ,
|
| DEFERRED_RESPONSE_COMPLETE,
|
| DEFERRED_FINISH
|
| };
|
| DeferredStage deferred_stage_;
|
|
|
| scoped_ptr<net::URLRequest> request_;
|
| scoped_ptr<ResourceHandler> handler_;
|
| ResourceLoaderDelegate* delegate_;
|
| + ResourceDispatcherHostDelegate* host_delegate_;
|
| + ResourceContext* resource_context_;
|
|
|
| scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_;
|
| scoped_ptr<SSLClientAuthHandler> ssl_client_auth_handler_;
|
|
|
| base::TimeTicks read_deferral_start_time_;
|
|
|
| // Indicates that we are in a state of being transferred to a new downstream
|
| // consumer. We are waiting for a notification to complete the transfer, at
|
| // which point we'll receive a new ResourceHandler.
|
| bool is_transferring_;
|
|
|