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 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_NAVIGATOR_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_NAVIGATOR_IMPL_H_ |
6 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_NAVIGATOR_IMPL_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_NAVIGATOR_IMPL_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "content/browser/frame_host/navigation_handle_impl.h" | 10 #include "content/browser/frame_host/navigation_handle_impl.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 InterstitialPageNavigatorImpl( | 23 InterstitialPageNavigatorImpl( |
24 InterstitialPageImpl* interstitial, | 24 InterstitialPageImpl* interstitial, |
25 NavigationControllerImpl* navigation_controller); | 25 NavigationControllerImpl* navigation_controller); |
26 | 26 |
27 NavigatorDelegate* GetDelegate() override; | 27 NavigatorDelegate* GetDelegate() override; |
28 NavigationController* GetController() override; | 28 NavigationController* GetController() override; |
29 void DidStartProvisionalLoad( | 29 void DidStartProvisionalLoad( |
30 RenderFrameHostImpl* render_frame_host, | 30 RenderFrameHostImpl* render_frame_host, |
31 const GURL& url, | 31 const GURL& url, |
32 const base::TimeTicks& navigation_start) override; | 32 const base::TimeTicks& navigation_start) override; |
33 void DidNavigate(RenderFrameHostImpl* render_frame_host, | 33 void DidNavigate( |
34 const FrameHostMsg_DidCommitProvisionalLoad_Params& | 34 RenderFrameHostImpl* render_frame_host, |
35 input_params) override; | 35 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params, |
| 36 std::unique_ptr<NavigationHandleImpl> navigation_handle) override; |
36 NavigationHandleImpl* GetNavigationHandleForFrameHost( | 37 NavigationHandleImpl* GetNavigationHandleForFrameHost( |
37 RenderFrameHostImpl* render_frame_host) override; | 38 RenderFrameHostImpl* render_frame_host) override; |
38 | 39 |
39 private: | 40 private: |
40 ~InterstitialPageNavigatorImpl() override; | 41 ~InterstitialPageNavigatorImpl() override; |
41 | 42 |
42 // The InterstitialPage with which this navigator object is associated. | 43 // The InterstitialPage with which this navigator object is associated. |
43 // Non owned pointer. | 44 // Non owned pointer. |
44 InterstitialPageImpl* interstitial_; | 45 InterstitialPageImpl* interstitial_; |
45 | 46 |
46 // The NavigationController associated with this navigator. | 47 // The NavigationController associated with this navigator. |
47 NavigationControllerImpl* controller_; | 48 NavigationControllerImpl* controller_; |
48 | 49 |
49 // The NavigationHandle associated with the interstitial navigation. | 50 // The NavigationHandle associated with the interstitial navigation. |
50 // Interstitials are assumed to only have a single RenderFrameHost, so it's ok | 51 // Interstitials are assumed to only have a single RenderFrameHost, so it's ok |
51 // to track the NavigationHandle here rather than per-frame. | 52 // to track the NavigationHandle here rather than per-frame. |
52 // | 53 // |
53 // Note: this NavigationHandleImpl will not send DidStartNavigation or | 54 // Note: this NavigationHandleImpl will not send DidStartNavigation or |
54 // DidFinishNavigation events to the WebContentsObserver, since those will go | 55 // DidFinishNavigation events to the WebContentsObserver, since those will go |
55 // through InterstitialPageImpl as the NavigatorDelegate and get dropped. | 56 // through InterstitialPageImpl as the NavigatorDelegate and get dropped. |
56 std::unique_ptr<NavigationHandleImpl> navigation_handle_; | 57 std::unique_ptr<NavigationHandleImpl> navigation_handle_; |
57 | 58 |
58 DISALLOW_COPY_AND_ASSIGN(InterstitialPageNavigatorImpl); | 59 DISALLOW_COPY_AND_ASSIGN(InterstitialPageNavigatorImpl); |
59 }; | 60 }; |
60 | 61 |
61 } // namespace content | 62 } // namespace content |
62 | 63 |
63 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_NAVIGATOR_IMPL_H_ | 64 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_NAVIGATOR_IMPL_H_ |
OLD | NEW |