Index: net/url_request/url_request.h |
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h |
index a42fd3a2d8647bf4570bfbf5ada4c4610001357a..65bd26b7460c20b2d01975c2a74fb312dc7b206b 100644 |
--- a/net/url_request/url_request.h |
+++ b/net/url_request/url_request.h |
@@ -429,8 +429,13 @@ class NET_API URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
return extra_request_headers_; |
} |
- // Returns the current load state for the request. |
- LoadState GetLoadState() const; |
+ // Returns the current load state for the request. |param| is an optional |
willchan no longer on Chromium
2011/07/29 07:34:38
I think you're working forward from the assumption
Matt Perry
2011/07/29 21:30:49
Agreed, I took care to avoid this assumption. That
|
+ // parameter describing details related to the load state. Not all load states |
+ // have a parameter. |
+ LoadStateWithParam GetLoadState() const; |
+ void SetLoadStateParam(const std::string& param) { |
+ load_state_param_ = param; |
+ } |
// Returns the current upload progress in bytes. |
uint64 GetUploadProgress() const; |
@@ -603,6 +608,11 @@ class NET_API URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
// cancel the request instead, call Cancel(). |
void ContinueDespiteLastError(); |
+ // Called when the delegate blocks or unblocks this request when intercepting |
willchan no longer on Chromium
2011/07/29 07:34:38
These should be private. I think you made them pub
eroman
2011/08/05 01:54:22
Matt, can you address Will's comment? (Note that U
Matt Perry
2011/08/08 22:14:33
Done.
|
+ // certain requests. |
+ void SetBlockedOnDelegate(); |
+ void SetUnblockedOnDelegate(); |
+ |
// Used to specify the context (cookie store, cache) for this request. |
const URLRequestContext* context() const; |
void set_context(const URLRequestContext* context); |
@@ -772,6 +782,14 @@ class NET_API URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) { |
// A globally unique identifier for this request. |
const uint64 identifier_; |
+ // True if this request is blocked waiting for the network delegate to resume |
+ // it. |
+ bool blocked_on_delegate_; |
+ |
+ // An optional parameter that provides additional information about the load |
+ // state. Only used with the LOAD_STATE_WAITING_FOR_DELEGATE state. |
+ std::string load_state_param_; |
+ |
base::debug::LeakTracker<URLRequest> leak_tracker_; |
// Callback passed to the network delegate to notify us when a blocked request |