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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 return has_user_gesture_; | 270 return has_user_gesture_; |
271 } | 271 } |
272 | 272 |
273 bool ResourceRequestInfoImpl::WasIgnoredByHandler() const { | 273 bool ResourceRequestInfoImpl::WasIgnoredByHandler() const { |
274 return was_ignored_by_handler_; | 274 return was_ignored_by_handler_; |
275 } | 275 } |
276 | 276 |
277 bool ResourceRequestInfoImpl::GetAssociatedRenderFrame( | 277 bool ResourceRequestInfoImpl::GetAssociatedRenderFrame( |
278 int* render_process_id, | 278 int* render_process_id, |
279 int* render_frame_id) const { | 279 int* render_frame_id) const { |
280 if (process_type_ == PROCESS_TYPE_PLUGIN) { | 280 *render_process_id = child_id_; |
281 *render_process_id = origin_pid_; | 281 *render_frame_id = render_frame_id_; |
282 *render_frame_id = render_frame_id_; | |
283 } else { | |
284 *render_process_id = child_id_; | |
285 *render_frame_id = render_frame_id_; | |
286 } | |
287 return true; | 282 return true; |
288 } | 283 } |
289 | 284 |
290 bool ResourceRequestInfoImpl::IsAsync() const { | 285 bool ResourceRequestInfoImpl::IsAsync() const { |
291 return is_async_; | 286 return is_async_; |
292 } | 287 } |
293 | 288 |
294 bool ResourceRequestInfoImpl::IsDownload() const { | 289 bool ResourceRequestInfoImpl::IsDownload() const { |
295 return is_download_; | 290 return is_download_; |
296 } | 291 } |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 base::WeakPtr<ResourceMessageFilter> filter) { | 330 base::WeakPtr<ResourceMessageFilter> filter) { |
336 child_id_ = child_id; | 331 child_id_ = child_id; |
337 route_id_ = route_id; | 332 route_id_ = route_id; |
338 render_frame_id_ = render_frame_id; | 333 render_frame_id_ = render_frame_id; |
339 origin_pid_ = origin_pid; | 334 origin_pid_ = origin_pid; |
340 request_id_ = request_id; | 335 request_id_ = request_id; |
341 filter_ = filter; | 336 filter_ = filter; |
342 } | 337 } |
343 | 338 |
344 } // namespace content | 339 } // namespace content |
OLD | NEW |