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/interstitial_page_navigator_impl.h" | 5 #include "content/browser/frame_host/interstitial_page_navigator_impl.h" |
6 | 6 |
7 #include "content/browser/frame_host/interstitial_page_impl.h" | 7 #include "content/browser/frame_host/interstitial_page_impl.h" |
8 #include "content/browser/frame_host/navigation_controller_impl.h" | 8 #include "content/browser/frame_host/navigation_controller_impl.h" |
9 #include "content/browser/frame_host/navigator_delegate.h" | 9 #include "content/browser/frame_host/navigator_delegate.h" |
10 #include "content/browser/renderer_host/render_view_host_impl.h" | 10 #include "content/browser/renderer_host/render_view_host_impl.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 return interstitial_; | 23 return interstitial_; |
24 } | 24 } |
25 | 25 |
26 NavigationController* InterstitialPageNavigatorImpl::GetController() { | 26 NavigationController* InterstitialPageNavigatorImpl::GetController() { |
27 return controller_; | 27 return controller_; |
28 } | 28 } |
29 | 29 |
30 void InterstitialPageNavigatorImpl::DidStartProvisionalLoad( | 30 void InterstitialPageNavigatorImpl::DidStartProvisionalLoad( |
31 RenderFrameHostImpl* render_frame_host, | 31 RenderFrameHostImpl* render_frame_host, |
32 const GURL& url, | 32 const GURL& url, |
33 const base::TimeTicks& navigation_start) { | 33 const base::TimeTicks& navigation_start, |
| 34 NavigationGesture gesture) { |
34 // The interstitial page should only navigate once. | 35 // The interstitial page should only navigate once. |
35 DCHECK(!render_frame_host->navigation_handle()); | 36 DCHECK(!render_frame_host->navigation_handle()); |
36 render_frame_host->SetNavigationHandle( | 37 render_frame_host->SetNavigationHandle( |
37 NavigationHandleImpl::Create(url, render_frame_host->frame_tree_node(), | 38 NavigationHandleImpl::Create(url, render_frame_host->frame_tree_node(), |
38 false, // is_renderer_initiated | 39 false, // is_renderer_initiated |
39 false, // is_synchronous | 40 false, // is_synchronous |
40 false, // is_srcdoc | 41 false, // is_srcdoc |
41 navigation_start, | 42 navigation_start, |
42 0, // pending_nav_entry_id | 43 0, // pending_nav_entry_id |
| 44 gesture, |
43 false) // started_in_context_menu | 45 false) // started_in_context_menu |
44 ); | 46 ); |
45 } | 47 } |
46 | 48 |
47 void InterstitialPageNavigatorImpl::DidNavigate( | 49 void InterstitialPageNavigatorImpl::DidNavigate( |
48 RenderFrameHostImpl* render_frame_host, | 50 RenderFrameHostImpl* render_frame_host, |
49 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params, | 51 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params, |
50 std::unique_ptr<NavigationHandleImpl> navigation_handle) { | 52 std::unique_ptr<NavigationHandleImpl> navigation_handle) { |
51 navigation_handle->DidCommitNavigation(input_params, false, | 53 navigation_handle->DidCommitNavigation(input_params, false, |
52 render_frame_host); | 54 render_frame_host); |
53 navigation_handle.reset(); | 55 navigation_handle.reset(); |
54 | 56 |
55 // TODO(nasko): Move implementation here, but for the time being call out | 57 // TODO(nasko): Move implementation here, but for the time being call out |
56 // to the interstitial page code. | 58 // to the interstitial page code. |
57 interstitial_->DidNavigate(render_frame_host->render_view_host(), | 59 interstitial_->DidNavigate(render_frame_host->render_view_host(), |
58 input_params); | 60 input_params); |
59 } | 61 } |
60 | 62 |
61 } // namespace content | 63 } // namespace content |
OLD | NEW |