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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
900 DidStartProvisionalLoad(frame)); | 900 DidStartProvisionalLoad(frame)); |
901 | 901 |
902 Send(new FrameHostMsg_DidStartProvisionalLoadForFrame( | 902 Send(new FrameHostMsg_DidStartProvisionalLoadForFrame( |
903 routing_id_, frame->identifier(), | 903 routing_id_, frame->identifier(), |
904 frame->parent() ? frame->parent()->identifier() : -1, | 904 frame->parent() ? frame->parent()->identifier() : -1, |
905 is_top_most, ds->request().url())); | 905 is_top_most, ds->request().url())); |
906 } | 906 } |
907 | 907 |
908 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad( | 908 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad( |
909 blink::WebFrame* frame) { | 909 blink::WebFrame* frame) { |
910 // TODO(nasko): Move implementation here. Needed state: | 910 if (frame->parent()) |
911 // * page_id_ | 911 return; |
912 render_view_->didReceiveServerRedirectForProvisionalLoad(frame); | 912 // Received a redirect on the main frame. |
| 913 WebDataSource* data_source = frame->provisionalDataSource(); |
| 914 if (!data_source) { |
| 915 // Should only be invoked when we have a data source. |
| 916 NOTREACHED(); |
| 917 return; |
| 918 } |
| 919 std::vector<GURL> redirects; |
| 920 RenderViewImpl::GetRedirectChain(data_source, &redirects); |
| 921 if (redirects.size() >= 2) { |
| 922 Send(new FrameHostMsg_DidRedirectProvisionalLoad( |
| 923 routing_id_, |
| 924 render_view_->page_id_, |
| 925 redirects[redirects.size() - 2], |
| 926 redirects.back())); |
| 927 } |
913 } | 928 } |
914 | 929 |
915 void RenderFrameImpl::didFailProvisionalLoad( | 930 void RenderFrameImpl::didFailProvisionalLoad( |
916 blink::WebFrame* frame, | 931 blink::WebFrame* frame, |
917 const blink::WebURLError& error) { | 932 const blink::WebURLError& error) { |
918 WebDataSource* ds = frame->provisionalDataSource(); | 933 WebDataSource* ds = frame->provisionalDataSource(); |
919 DCHECK(ds); | 934 DCHECK(ds); |
920 | 935 |
921 const WebURLRequest& failed_request = ds->request(); | 936 const WebURLRequest& failed_request = ds->request(); |
922 | 937 |
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1521 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { | 1536 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { |
1522 observers_.AddObserver(observer); | 1537 observers_.AddObserver(observer); |
1523 } | 1538 } |
1524 | 1539 |
1525 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { | 1540 void RenderFrameImpl::RemoveObserver(RenderFrameObserver* observer) { |
1526 observer->RenderFrameGone(); | 1541 observer->RenderFrameGone(); |
1527 observers_.RemoveObserver(observer); | 1542 observers_.RemoveObserver(observer); |
1528 } | 1543 } |
1529 | 1544 |
1530 } // namespace content | 1545 } // namespace content |
OLD | NEW |