OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/async_resource_handler.h" | 5 #include "content/browser/renderer_host/async_resource_handler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/debug/alias.h" | 10 #include "base/debug/alias.h" |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 position, size)); | 137 position, size)); |
138 } | 138 } |
139 | 139 |
140 bool AsyncResourceHandler::OnRequestRedirected(int request_id, | 140 bool AsyncResourceHandler::OnRequestRedirected(int request_id, |
141 const GURL& new_url, | 141 const GURL& new_url, |
142 ResourceResponse* response, | 142 ResourceResponse* response, |
143 bool* defer) { | 143 bool* defer) { |
144 *defer = did_defer_ = true; | 144 *defer = did_defer_ = true; |
145 | 145 |
146 if (rdh_->delegate()) { | 146 if (rdh_->delegate()) { |
147 rdh_->delegate()->OnRequestRedirected(request_, filter_->resource_context(), | 147 rdh_->delegate()->OnRequestRedirected(new_url, request_, |
| 148 filter_->resource_context(), |
148 response); | 149 response); |
149 } | 150 } |
150 | 151 |
151 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); | 152 DevToolsNetLogObserver::PopulateResponseInfo(request_, response); |
152 response->head.request_start = request_->creation_time(); | 153 response->head.request_start = request_->creation_time(); |
153 response->head.response_start = TimeTicks::Now(); | 154 response->head.response_start = TimeTicks::Now(); |
154 return filter_->Send(new ResourceMsg_ReceivedRedirect( | 155 return filter_->Send(new ResourceMsg_ReceivedRedirect( |
155 routing_id_, request_id, new_url, response->head)); | 156 routing_id_, request_id, new_url, response->head)); |
156 } | 157 } |
157 | 158 |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 } | 352 } |
352 | 353 |
353 void AsyncResourceHandler::ResumeIfDeferred() { | 354 void AsyncResourceHandler::ResumeIfDeferred() { |
354 if (did_defer_) { | 355 if (did_defer_) { |
355 did_defer_ = false; | 356 did_defer_ = false; |
356 controller()->Resume(); | 357 controller()->Resume(); |
357 } | 358 } |
358 } | 359 } |
359 | 360 |
360 } // namespace content | 361 } // namespace content |
OLD | NEW |