| 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" |
| 11 #include "content/browser/frame_host/render_frame_host_impl.h" | 11 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 12 #include "content/browser/web_contents/web_contents_impl.h" | 12 #include "content/browser/web_contents/web_contents_impl.h" |
| 13 | 13 |
| 14 namespace content { | 14 namespace content { |
| 15 | 15 |
| 16 WebContents* NavigationHandle::GetWebContents() { | 16 WebContents* NavigationHandle::GetWebContents() { |
| 17 // The NavigationHandleImpl cannot access the WebContentsImpl as it would be | 17 // The NavigationHandleImpl cannot access the WebContentsImpl as it would be |
| 18 // a layering violation, hence the cast here. | 18 // a layering violation, hence the cast here. |
| 19 return static_cast<WebContentsImpl*>( | 19 return static_cast<WebContentsImpl*>( |
| 20 static_cast<NavigationHandleImpl*>(this)->GetDelegate()); | 20 static_cast<NavigationHandleImpl*>(this)->GetDelegate()); |
| 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_document) { |
| 31 RenderFrameHostImpl* rfhi = | 31 RenderFrameHostImpl* rfhi = |
| 32 static_cast<RenderFrameHostImpl*>(render_frame_host); | 32 static_cast<RenderFrameHostImpl*>(render_frame_host); |
| 33 std::unique_ptr<NavigationHandleImpl> handle_impl = | 33 std::unique_ptr<NavigationHandleImpl> handle_impl = |
| 34 NavigationHandleImpl::Create( | 34 NavigationHandleImpl::Create( |
| 35 url, std::vector<GURL>(), rfhi->frame_tree_node(), | 35 url, std::vector<GURL>(), rfhi->frame_tree_node(), |
| 36 true, // is_renderer_initiated | 36 true, // is_renderer_initiated |
| 37 is_same_page, base::TimeTicks::Now(), 0, | 37 is_same_document, base::TimeTicks::Now(), 0, |
| 38 false, // started_from_context_menu | 38 false, // started_from_context_menu |
| 39 CSPDisposition::CHECK, // should_check_main_world_csp | 39 CSPDisposition::CHECK, // should_check_main_world_csp |
| 40 false); // is_form_submission | 40 false); // is_form_submission |
| 41 handle_impl->set_render_frame_host(rfhi); | 41 handle_impl->set_render_frame_host(rfhi); |
| 42 if (error != net::OK) | 42 if (error != net::OK) |
| 43 handle_impl->set_net_error_code(error); | 43 handle_impl->set_net_error_code(error); |
| 44 if (committed) | 44 if (committed) |
| 45 handle_impl->CallDidCommitNavigationForTesting(url); | 45 handle_impl->CallDidCommitNavigationForTesting(url); |
| 46 return std::unique_ptr<NavigationHandle>(std::move(handle_impl)); | 46 return std::unique_ptr<NavigationHandle>(std::move(handle_impl)); |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace content | 49 } // namespace content |
| OLD | NEW |