| 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/browser/frame_host/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 822 RequestNavigationParams request_params(entry.GetHasPostData(), | 822 RequestNavigationParams request_params(entry.GetHasPostData(), |
| 823 entry.extra_headers(), | 823 entry.extra_headers(), |
| 824 entry.GetBrowserInitiatedPostData()); | 824 entry.GetBrowserInitiatedPostData()); |
| 825 // TODO(clamy): Check if navigations are blocked and if so store the | 825 // TODO(clamy): Check if navigations are blocked and if so store the |
| 826 // parameters. | 826 // parameters. |
| 827 | 827 |
| 828 // If there is an ongoing request, replace it. | 828 // If there is an ongoing request, replace it. |
| 829 navigation_request_map_.set(frame_tree_node_id, navigation_request.Pass()); | 829 navigation_request_map_.set(frame_tree_node_id, navigation_request.Pass()); |
| 830 | 830 |
| 831 if (frame_tree_node->current_frame_host()->IsRenderFrameLive()) { | 831 if (frame_tree_node->current_frame_host()->IsRenderFrameLive()) { |
| 832 // TODO(clamy): send a RequestNavigation IPC. | 832 frame_tree_node->current_frame_host()->Send(new FrameMsg_RequestNavigation( |
| 833 NOTIMPLEMENTED(); | 833 frame_tree_node->current_frame_host()->GetRoutingID(), |
| 834 navigation_request_map_.get(frame_tree_node_id)->common_params(), |
| 835 request_params)); |
| 834 return true; | 836 return true; |
| 835 } | 837 } |
| 836 | 838 |
| 837 // The navigation request is sent directly to the IO thread. | 839 // The navigation request is sent directly to the IO thread. |
| 838 OnBeginNavigation( | 840 OnBeginNavigation( |
| 839 frame_tree_node, | 841 frame_tree_node, |
| 840 MakeDefaultBeginNavigation(request_params, navigation_type), | 842 MakeDefaultBeginNavigation(request_params, navigation_type), |
| 841 navigation_request_map_.get(frame_tree_node_id)->common_params()); | 843 navigation_request_map_.get(frame_tree_node_id)->common_params()); |
| 842 return true; | 844 return true; |
| 843 } | 845 } |
| 844 | 846 |
| 845 } // namespace content | 847 } // namespace content |
| OLD | NEW |