Chromium Code Reviews| Index: content/renderer/render_frame_impl.cc |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
| index 55b25367845fe18c2ca0c7a2681f622aaf77a0d3..c08314ffad32abcd2d9f1602c4fa0238f4949407 100644 |
| --- a/content/renderer/render_frame_impl.cc |
| +++ b/content/renderer/render_frame_impl.cc |
| @@ -907,9 +907,22 @@ void RenderFrameImpl::didStartProvisionalLoad(blink::WebFrame* frame) { |
| void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad( |
| blink::WebFrame* frame) { |
| - // TODO(nasko): Move implementation here. Needed state: |
| - // * page_id_ |
| - render_view_->didReceiveServerRedirectForProvisionalLoad(frame); |
| + if (frame->parent()) |
| + return; |
| + // Received a redirect on the main frame. |
| + WebDataSource* data_source = frame->provisionalDataSource(); |
| + if (!data_source) { |
| + // Should only be invoked when we have a data source. |
| + NOTREACHED(); |
| + return; |
| + } |
| + std::vector<GURL> redirects; |
| + RenderViewImpl::GetRedirectChain(data_source, &redirects); |
| + if (redirects.size() >= 2) { |
| + Send(new FrameHostMsg_DidRedirectProvisionalLoad(routing_id_, |
|
jam
2014/01/10 16:19:31
nit: i realize you just moved it, but can you fix
nasko
2014/01/10 19:54:39
Done.
|
| + render_view_->page_id_, redirects[redirects.size() - 2], |
| + redirects.back())); |
| + } |
| } |
| void RenderFrameImpl::didFailProvisionalLoad( |