| Index: content/browser/loader/resource_loader.h
|
| diff --git a/content/browser/loader/resource_loader.h b/content/browser/loader/resource_loader.h
|
| index 6a611a723f5815b8a29fe9984552003b38f9b25a..982778bb32d5ee3cf0505fffe830cb87e9909a08 100644
|
| --- a/content/browser/loader/resource_loader.h
|
| +++ b/content/browser/loader/resource_loader.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "base/timer/timer.h"
|
| #include "content/browser/loader/resource_handler.h"
|
| #include "content/browser/ssl/ssl_error_handler.h"
|
| #include "content/common/content_export.h"
|
| @@ -39,6 +40,9 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| void StartRequest();
|
| void CancelRequest(bool from_renderer);
|
|
|
| + // Start a timer to cancel the request in the future.
|
| + void CancelAfterTimeout();
|
| +
|
| void ReportUploadProgress();
|
|
|
| bool is_transferring() const { return is_transferring_; }
|
| @@ -54,6 +58,8 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| // IPC message handlers:
|
| void OnUploadProgressACK();
|
|
|
| + void set_detachable_delay_ms(int delay) { detachable_delay_ms_ = delay; }
|
| +
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(ResourceLoaderTest, ClientCertStoreLookup);
|
|
|
| @@ -97,6 +103,7 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
|
|
| void StartRequestInternal();
|
| void CancelRequestInternal(int error, bool from_renderer);
|
| +
|
| void CompleteResponseStarted();
|
| void StartReading(bool is_continuation);
|
| void ResumeReading();
|
| @@ -133,6 +140,10 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| // which point we'll receive a new ResourceHandler.
|
| bool is_transferring_;
|
|
|
| + int detachable_delay_ms_;
|
| +
|
| + scoped_ptr<base::OneShotTimer<ResourceLoader> > detached_timer_;
|
| +
|
| scoped_ptr<net::ClientCertStore> client_cert_store_;
|
|
|
| base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_;
|
|
|