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 c231724a78d2e4f3352f2f9342a67ed34a5a6370..de0669e134337fb6cfe5524db9abde75cdd5f535 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -34,6 +34,7 @@ |
#include "content/browser/frame_host/render_frame_proxy_host.h" |
#include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
#include "content/browser/geolocation/geolocation_service_context.h" |
+#include "content/browser/loader/resource_dispatcher_host_impl.h" |
#include "content/browser/permissions/permission_service_context.h" |
#include "content/browser/permissions/permission_service_impl.h" |
#include "content/browser/presentation/presentation_service_impl.h" |
@@ -779,9 +780,7 @@ void RenderFrameHostImpl::SetRenderFrameCreated(bool created) { |
} |
void RenderFrameHostImpl::Init() { |
- // TODO(csharrison): Call GetProcess()->ResumeRequestsForFrame(routing_id_) |
- // once ResourceDispatcherHostImpl is keyed on render frame routing ids |
- // instead of render view routing ids. |
+ ResourceDispatcherHost::ResumeBlockedRequestsForFrameFromUI(this); |
} |
void RenderFrameHostImpl::OnAddMessageToConsole( |
@@ -1077,6 +1076,10 @@ RenderWidgetHostView* RenderFrameHostImpl::GetView() { |
return nullptr; |
} |
+GlobalFrameRoutingId RenderFrameHostImpl::GetGlobalFrameRoutingId() { |
+ return GlobalFrameRoutingId(GetProcess()->GetID(), GetRoutingID()); |
+} |
+ |
int RenderFrameHostImpl::GetEnabledBindings() { |
return render_view_host_->GetEnabledBindings(); |
} |