summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-31 21:17:54 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-31 21:17:54 +0000
commitef3aabd796c4c4da1138096fe3b0624034b60da0 (patch)
tree1bb96ed2fa9c8d1b4887a9efafa0bb988a6d3dba /chrome
parent19ca3bd489db30a89f965b294e4873c8aa102294 (diff)
downloadchromium_src-ef3aabd796c4c4da1138096fe3b0624034b60da0.zip
chromium_src-ef3aabd796c4c4da1138096fe3b0624034b60da0.tar.gz
chromium_src-ef3aabd796c4c4da1138096fe3b0624034b60da0.tar.bz2
249: Fix more compile errors.
The includes were introduced with the Zoom patch which is not on 249. The global id include was introduced in http://codereview.chromium.org/460108 , which is too big for merging, given that the workaround is trivial. TBR=pkasting. Review URL: http://codereview.chromium.org/557075 git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@37669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/renderer_host/async_resource_handler.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/async_resource_handler.cc b/chrome/browser/renderer_host/async_resource_handler.cc
index 7723a45..5bf5bab 100644
--- a/chrome/browser/renderer_host/async_resource_handler.cc
+++ b/chrome/browser/renderer_host/async_resource_handler.cc
@@ -7,6 +7,8 @@
#include "base/logging.h"
#include "base/process.h"
#include "base/shared_memory.h"
+#include "chrome/browser/net/chrome_url_request_context.h"
+#include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
#include "chrome/common/render_messages.h"
#include "net/base/io_buffer.h"
@@ -103,7 +105,7 @@ bool AsyncResourceHandler::OnResponseStarted(int request_id,
// request commits, avoiding the possibility of e.g. zooming the old content
// or of having to layout the new content twice.
URLRequest* request = rdh_->GetURLRequest(
- GlobalRequestID(process_id_, request_id));
+ ResourceDispatcherHost::GlobalRequestID(process_id_, request_id));
ResourceDispatcherHostRequestInfo* info = rdh_->InfoForRequest(request);
if (info->resource_type() == ResourceType::MAIN_FRAME) {
std::string host(request->url().host());