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..10400c6f6d99dc39e16fa683a38fbd1c8072d0ce 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,10 @@ void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone( |
| routing_id_, callback_context)); |
| } |
| +void RenderFrameHostImpl::SetHasPendingTransitionRequest( |
| + bool has_pending_request) { |
| + TransitionRequestManager::GetInstance()->SetHasPendingTransitionRequest( |
| + GetProcess()->GetID(), GetRoutingID(), has_pending_request); |
|
jam
2014/06/11 02:00:21
nit: routing_id_ instead of GetRoutingID, which is
shatch
2014/06/14 00:41:37
Done.
|
| +} |
| + |
| } // namespace content |