Chromium Code Reviews| 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/loader/resource_request_info_impl.h" | 5 #include "content/browser/loader/resource_request_info_impl.h" |
| 6 | 6 |
| 7 #include "content/browser/frame_host/frame_tree_node.h" | 7 #include "content/browser/frame_host/frame_tree_node.h" |
| 8 #include "content/browser/loader/global_routing_id.h" | 8 #include "content/browser/loader/global_routing_id.h" |
| 9 #include "content/browser/loader/resource_message_filter.h" | 9 #include "content/browser/loader/resource_message_filter.h" |
| 10 #include "content/browser/web_contents/web_contents_impl.h" | 10 #include "content/browser/web_contents/web_contents_impl.h" |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 323 | 323 |
| 324 GlobalRoutingID ResourceRequestInfoImpl::GetGlobalRoutingID() const { | 324 GlobalRoutingID ResourceRequestInfoImpl::GetGlobalRoutingID() const { |
| 325 return GlobalRoutingID(child_id_, route_id_); | 325 return GlobalRoutingID(child_id_, route_id_); |
| 326 } | 326 } |
| 327 | 327 |
| 328 void ResourceRequestInfoImpl::UpdateForTransfer( | 328 void ResourceRequestInfoImpl::UpdateForTransfer( |
| 329 int child_id, | 329 int child_id, |
| 330 int route_id, | 330 int route_id, |
| 331 int origin_pid, | 331 int origin_pid, |
| 332 int request_id, | 332 int request_id, |
| 333 int render_frame_id, | |
|
Randy Smith (Not in Mondays)
2015/12/29 23:11:37
Good catch. (== Ooops, I should have caught this
Charlie Harrison
2015/12/30 20:51:49
No prob!
| |
| 333 int parent_render_frame_id, | 334 int parent_render_frame_id, |
| 334 base::WeakPtr<ResourceMessageFilter> filter) { | 335 base::WeakPtr<ResourceMessageFilter> filter) { |
| 335 child_id_ = child_id; | 336 child_id_ = child_id; |
| 336 route_id_ = route_id; | 337 route_id_ = route_id; |
| 337 origin_pid_ = origin_pid; | 338 origin_pid_ = origin_pid; |
| 338 request_id_ = request_id; | 339 request_id_ = request_id; |
| 340 render_frame_id_ = render_frame_id; | |
| 339 parent_render_frame_id_ = parent_render_frame_id; | 341 parent_render_frame_id_ = parent_render_frame_id; |
| 340 filter_ = filter; | 342 filter_ = filter; |
| 341 } | 343 } |
| 342 | 344 |
| 343 } // namespace content | 345 } // namespace content |
| OLD | NEW |