| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/public/browser/navigation_handle.h" | 5 #include "content/public/browser/navigation_handle.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "content/browser/frame_host/navigation_handle_impl.h" | 9 #include "content/browser/frame_host/navigation_handle_impl.h" |
| 10 #include "content/browser/frame_host/navigator.h" | 10 #include "content/browser/frame_host/navigator.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 } | 21 } |
| 22 | 22 |
| 23 // static | 23 // static |
| 24 std::unique_ptr<NavigationHandle> | 24 std::unique_ptr<NavigationHandle> |
| 25 NavigationHandle::CreateNavigationHandleForTesting( | 25 NavigationHandle::CreateNavigationHandleForTesting( |
| 26 const GURL& url, | 26 const GURL& url, |
| 27 RenderFrameHost* render_frame_host, | 27 RenderFrameHost* render_frame_host, |
| 28 bool committed, | 28 bool committed, |
| 29 net::Error error, | 29 net::Error error, |
| 30 bool is_same_page) { | 30 bool is_same_page) { |
| 31 RenderFrameHostImpl* rfhi = |
| 32 static_cast<RenderFrameHostImpl*>(render_frame_host); |
| 31 std::unique_ptr<NavigationHandleImpl> handle_impl = | 33 std::unique_ptr<NavigationHandleImpl> handle_impl = |
| 32 NavigationHandleImpl::Create( | 34 NavigationHandleImpl::Create( |
| 33 url, static_cast<RenderFrameHostImpl*>(render_frame_host) | 35 url, std::vector<GURL>(), rfhi->frame_tree_node(), |
| 34 ->frame_tree_node(), | |
| 35 true, // is_renderer_initiated | 36 true, // is_renderer_initiated |
| 36 is_same_page, | 37 is_same_page, |
| 37 base::TimeTicks::Now(), 0, | 38 base::TimeTicks::Now(), 0, |
| 38 false); // started_from_context_menu | 39 false); // started_from_context_menu |
| 39 handle_impl->set_render_frame_host( | 40 handle_impl->set_render_frame_host(rfhi); |
| 40 static_cast<RenderFrameHostImpl*>(render_frame_host)); | |
| 41 if (error != net::OK) | 41 if (error != net::OK) |
| 42 handle_impl->set_net_error_code(error); | 42 handle_impl->set_net_error_code(error); |
| 43 if (committed) | 43 if (committed) |
| 44 handle_impl->CallDidCommitNavigationForTesting(url); | 44 handle_impl->CallDidCommitNavigationForTesting(url); |
| 45 return std::unique_ptr<NavigationHandle>(std::move(handle_impl)); | 45 return std::unique_ptr<NavigationHandle>(std::move(handle_impl)); |
| 46 } | 46 } |
| 47 | 47 |
| 48 } // namespace content | 48 } // namespace content |
| OLD | NEW |