| 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..bc5b47f674221c926ba1990cae24ea8fdf0d1045 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"
|
| @@ -97,6 +98,8 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
|
|
| void StartRequestInternal();
|
| void CancelRequestInternal(int error, bool from_renderer);
|
| + bool DelayCancelForPrefetch(const ResourceRequestInfoImpl& info,
|
| + bool from_renderer);
|
| void CompleteResponseStarted();
|
| void StartReading(bool is_continuation);
|
| void ResumeReading();
|
| @@ -133,8 +136,14 @@ class CONTENT_EXPORT ResourceLoader : public net::URLRequest::Delegate,
|
| // which point we'll receive a new ResourceHandler.
|
| bool is_transferring_;
|
|
|
| + scoped_ptr<base::OneShotTimer<ResourceLoader> > prefetch_timer_;
|
| +
|
| scoped_ptr<net::ClientCertStore> client_cert_store_;
|
|
|
| + // The time in ms to delay a cancel of a prefetch unless otherwise specified
|
| + // by a flag.
|
| + static int default_delay_prefetch_cancel_ms_;
|
| +
|
| base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
|
|
|