summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/async_resource_handler.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 20:04:35 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 20:04:35 +0000
commit92b24c11f42b31158cca43921eac16f33c98839c (patch)
tree81304558304a29fb589327af857db90294f17fc8 /chrome/browser/renderer_host/async_resource_handler.cc
parent8eadc12f4690e648e11b5f84733da84f2f8825a8 (diff)
downloadchromium_src-92b24c11f42b31158cca43921eac16f33c98839c.zip
chromium_src-92b24c11f42b31158cca43921eac16f33c98839c.tar.gz
chromium_src-92b24c11f42b31158cca43921eac16f33c98839c.tar.bz2
Implement ResourceQueue, an object that makes it easy to delay starting
requests in ResourceDispatcherHost until specified conditions are met. Make UserScriptListener use ResourceQueue. This is the first step toward waiting for the privacy blacklists to load. TEST=Covered by unit_tests. BUG=21541 Review URL: http://codereview.chromium.org/460108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/async_resource_handler.cc')
-rw-r--r--chrome/browser/renderer_host/async_resource_handler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/async_resource_handler.cc b/chrome/browser/renderer_host/async_resource_handler.cc
index 91a2bb4..7b5e8c2 100644
--- a/chrome/browser/renderer_host/async_resource_handler.cc
+++ b/chrome/browser/renderer_host/async_resource_handler.cc
@@ -8,6 +8,7 @@
#include "base/process.h"
#include "base/shared_memory.h"
#include "chrome/browser/net/chrome_url_request_context.h"
+#include "chrome/browser/renderer_host/global_request_id.h"
#include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
#include "chrome/common/render_messages.h"
#include "net/base/io_buffer.h"
@@ -105,7 +106,7 @@ bool AsyncResourceHandler::OnResponseStarted(int request_id,
// avoiding the possibility of zooming the old content or of having to layout
// the new content twice.
URLRequest* request = rdh_->GetURLRequest(
- ResourceDispatcherHost::GlobalRequestID(process_id_, request_id));
+ GlobalRequestID(process_id_, request_id));
ResourceDispatcherHostRequestInfo* info = rdh_->InfoForRequest(request);
if (info->resource_type() == ResourceType::MAIN_FRAME) {
std::string host(request->url().host());