Chromium Code Reviews| Index: content/browser/frame_host/render_frame_host_impl.cc |
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc |
| index a62b7f8cd18f1ac9a9a4f9aa57a18f1fad49ce28..cd68058cb65c4c7d23ed9780b4e8cbe7684921d4 100644 |
| --- a/content/browser/frame_host/render_frame_host_impl.cc |
| +++ b/content/browser/frame_host/render_frame_host_impl.cc |
| @@ -19,6 +19,7 @@ |
| #include "content/browser/renderer_host/input/input_router.h" |
| #include "content/browser/renderer_host/input/timeout_monitor.h" |
| #include "content/browser/renderer_host/render_view_host_impl.h" |
| +#include "content/browser/transition_request_manager.h" |
| #include "content/common/desktop_notification_messages.h" |
| #include "content/common/frame_messages.h" |
| #include "content/common/input_messages.h" |
| @@ -505,6 +506,15 @@ void RenderFrameHostImpl::OnCrossSiteResponse( |
| should_replace_current_entry); |
| } |
| +void RenderFrameHostImpl::OnDeferredAfterResponseStarted( |
| + const GlobalRequestID& global_request_id) { |
| + frame_tree_node_->render_manager()->OnDeferredAfterResponseStarted( |
| + global_request_id, this); |
| + |
| + if (!GetParent()) |
| + delegate_->DidDeferAfterResponseStarted(); |
| +} |
| + |
| void RenderFrameHostImpl::SwapOut(RenderFrameProxyHost* proxy) { |
| // TODO(creis): Move swapped out state to RFH. Until then, only update it |
| // when swapping out the main frame. |
| @@ -891,4 +901,12 @@ void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone( |
| routing_id_, callback_context)); |
| } |
| +void RenderFrameHostImpl::SetHasPendingTransitionRequest( |
|
nasko
2014/06/02 21:59:33
Does this method ever get called with value of tru
shatch
2014/06/02 23:40:40
Yeah, this will get called eventually by the embed
|
| + bool has_pending_request) { |
| + TransitionRequestManager::GetInstance()->SetHasPendingTransitionRequest( |
| + GetProcess()->GetID(), |
| + render_view_host_->GetRoutingID(), |
|
nasko
2014/06/02 21:59:33
Why use the routing id of the RVH and not the RFH
shatch
2014/06/02 23:40:40
Changed to RFH routing id per offline discussion.
|
| + has_pending_request); |
| +} |
| + |
| } // namespace content |