OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/containers/hash_tables.h" | 8 #include "base/containers/hash_tables.h" |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/metrics/user_metrics_action.h" | 10 #include "base/metrics/user_metrics_action.h" |
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 const std::vector<GURL>& transfer_url_chain, | 498 const std::vector<GURL>& transfer_url_chain, |
499 const Referrer& referrer, | 499 const Referrer& referrer, |
500 PageTransition page_transition, | 500 PageTransition page_transition, |
501 bool should_replace_current_entry) { | 501 bool should_replace_current_entry) { |
502 frame_tree_node_->render_manager()->OnCrossSiteResponse( | 502 frame_tree_node_->render_manager()->OnCrossSiteResponse( |
503 this, global_request_id, cross_site_transferring_request.Pass(), | 503 this, global_request_id, cross_site_transferring_request.Pass(), |
504 transfer_url_chain, referrer, page_transition, | 504 transfer_url_chain, referrer, page_transition, |
505 should_replace_current_entry); | 505 should_replace_current_entry); |
506 } | 506 } |
507 | 507 |
| 508 void RenderFrameHostImpl::OnDeferredAfterResponseStarted( |
| 509 const GlobalRequestID& global_request_id) { |
| 510 frame_tree_node_->render_manager()->OnDeferredAfterResponseStarted( |
| 511 global_request_id, this); |
| 512 |
| 513 if (!GetParent()) |
| 514 delegate_->DidDeferAfterResponseStarted(); |
| 515 } |
| 516 |
508 void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) { | 517 void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) { |
509 // TODO(creis): Move swapped out state to RFH. Until then, only update it | 518 // TODO(creis): Move swapped out state to RFH. Until then, only update it |
510 // when swapping out the main frame. | 519 // when swapping out the main frame. |
511 if (!GetParent()) { | 520 if (!GetParent()) { |
512 // If this RenderViewHost is not in the default state, it must have already | 521 // If this RenderViewHost is not in the default state, it must have already |
513 // gone through this, therefore just return. | 522 // gone through this, therefore just return. |
514 if (render_view_host_->rvh_state_ != RenderViewHostImpl::STATE_DEFAULT) | 523 if (render_view_host_->rvh_state_ != RenderViewHostImpl::STATE_DEFAULT) |
515 return; | 524 return; |
516 | 525 |
517 render_view_host_->SetState( | 526 render_view_host_->SetState( |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
885 cancel_notification_callbacks_.erase(notification_id); | 894 cancel_notification_callbacks_.erase(notification_id); |
886 } | 895 } |
887 | 896 |
888 void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone( | 897 void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone( |
889 int callback_context) { | 898 int callback_context) { |
890 Send(new DesktopNotificationMsg_PermissionRequestDone( | 899 Send(new DesktopNotificationMsg_PermissionRequestDone( |
891 routing_id_, callback_context)); | 900 routing_id_, callback_context)); |
892 } | 901 } |
893 | 902 |
894 } // namespace content | 903 } // namespace content |
OLD | NEW |