diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-07 14:18:56 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-11 10:23:13 +0000 |
| commit | 201ade2fbba22bfb27ae029f4d23fca6ded109a0 (patch) | |
| tree | b793f4ed916f73cf18357ea467ff3deb5ffb5b52 /chrome/common/resource_dispatcher.h | |
| parent | d8c4c37a7d0961944bfdfaa117d5c68c8e129c97 (diff) | |
| download | external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.zip external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.gz external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.bz2 | |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
Diffstat (limited to 'chrome/common/resource_dispatcher.h')
| -rw-r--r-- | chrome/common/resource_dispatcher.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/common/resource_dispatcher.h b/chrome/common/resource_dispatcher.h index 475119f..3ca3492 100644 --- a/chrome/common/resource_dispatcher.h +++ b/chrome/common/resource_dispatcher.h @@ -12,6 +12,7 @@ #include <string> #include "base/hash_tables.h" +#include "base/linked_ptr.h" #include "base/shared_memory.h" #include "base/task.h" #include "ipc/ipc_channel.h" @@ -79,6 +80,7 @@ class ResourceDispatcher { MessageQueue deferred_message_queue; bool is_deferred; GURL url; + linked_ptr<IPC::Message> pending_redirect_message; }; typedef base::hash_map<int, PendingRequestInfo> PendingRequestList; @@ -86,6 +88,9 @@ class ResourceDispatcher { // May return NULL if the request as been canceled from the client side. PendingRequestInfo* GetPendingRequestInfo(int request_id); + // Follows redirect, if any, for the given request. + void FollowPendingRedirect(int request_id, PendingRequestInfo& request_info); + // Message response handlers, called by the message handler for this process. void OnUploadProgress( const IPC::Message& message, |