| Index: content/browser/renderer_host/resource_loader_impl.h
|
| diff --git a/content/browser/renderer_host/resource_loader.h b/content/browser/renderer_host/resource_loader_impl.h
|
| similarity index 79%
|
| copy from content/browser/renderer_host/resource_loader.h
|
| copy to content/browser/renderer_host/resource_loader_impl.h
|
| index 893750365af565d0ad40406eaf1ae526c5044fd4..6d25dadd10e2807292200ff35ca2f81c318bf874 100644
|
| --- a/content/browser/renderer_host/resource_loader.h
|
| +++ b/content/browser/renderer_host/resource_loader_impl.h
|
| @@ -2,35 +2,40 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_
|
| -#define CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_
|
| +#ifndef CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_IMPL_H_
|
| +#define CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_IMPL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/browser/renderer_host/resource_handler.h"
|
| +#include "content/browser/renderer_host/resource_loader.h"
|
| #include "content/browser/ssl/ssl_error_handler.h"
|
| #include "content/public/browser/resource_controller.h"
|
| #include "net/url_request/url_request.h"
|
|
|
| namespace content {
|
| class ResourceDispatcherHostLoginDelegate;
|
| -class ResourceLoaderDelegate;
|
| +class ResourceLoaderImplDelegate;
|
| class ResourceRequestInfoImpl;
|
| class SSLClientAuthHandler;
|
|
|
| // 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 ResourceLoader : public net::URLRequest::Delegate,
|
| - public SSLErrorHandler::Delegate,
|
| - public ResourceController {
|
| +class ResourceLoaderImpl : public ResourceLoader,
|
| + public net::URLRequest::Delegate,
|
| + public SSLErrorHandler::Delegate,
|
| + public ResourceController {
|
| public:
|
| - ResourceLoader(scoped_ptr<net::URLRequest> request,
|
| - scoped_ptr<ResourceHandler> handler,
|
| - ResourceLoaderDelegate* delegate);
|
| - virtual ~ResourceLoader();
|
| + ResourceLoaderImpl(scoped_ptr<net::URLRequest> request,
|
| + scoped_ptr<ResourceHandler> handler,
|
| + ResourceLoaderImplDelegate* delegate);
|
| + virtual ~ResourceLoaderImpl();
|
| +
|
| + // ResourceLoader implementation
|
| + virtual void StartRequest();
|
| + virtual net::URLRequest* request() { return request_.get(); }
|
|
|
| - void StartRequest();
|
| void CancelRequest(bool from_renderer);
|
|
|
| void ReportUploadProgress();
|
| @@ -40,7 +45,6 @@ class ResourceLoader : public net::URLRequest::Delegate,
|
| void WillCompleteTransfer();
|
| void CompleteTransfer(scoped_ptr<ResourceHandler> new_handler);
|
|
|
| - net::URLRequest* request() { return request_.get(); }
|
| ResourceRequestInfoImpl* GetRequestInfo();
|
|
|
| void ClearLoginDelegate();
|
| @@ -100,7 +104,7 @@ class ResourceLoader : public net::URLRequest::Delegate,
|
|
|
| scoped_ptr<net::URLRequest> request_;
|
| scoped_ptr<ResourceHandler> handler_;
|
| - ResourceLoaderDelegate* delegate_;
|
| + ResourceLoaderImplDelegate* delegate_;
|
|
|
| scoped_refptr<ResourceDispatcherHostLoginDelegate> login_delegate_;
|
| scoped_refptr<SSLClientAuthHandler> ssl_client_auth_handler_;
|
| @@ -114,11 +118,11 @@ class ResourceLoader : public net::URLRequest::Delegate,
|
| // which point we'll receive a new ResourceHandler.
|
| bool is_transferring_;
|
|
|
| - base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_;
|
| + base::WeakPtrFactory<ResourceLoaderImpl> weak_ptr_factory_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
|
| + DISALLOW_COPY_AND_ASSIGN(ResourceLoaderImpl);
|
| };
|
|
|
| } // namespace content
|
|
|
| -#endif // CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_
|
| +#endif // CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_IMPL_H_
|
|
|