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_NAVIGATOR_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ |
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ |
7 | 7 |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "content/common/content_export.h" | 9 #include "content/common/content_export.h" |
10 #include "content/public/browser/navigation_controller.h" | 10 #include "content/public/browser/navigation_controller.h" |
11 #include "ui/base/window_open_disposition.h" | 11 #include "ui/base/window_open_disposition.h" |
12 | 12 |
13 class GURL; | 13 class GURL; |
14 struct FrameHostMsg_BeginNavigation_Params; | 14 struct FrameHostMsg_BeginNavigation_Params; |
| 15 struct FrameMsg_CommitNavigation_Params; |
15 struct FrameHostMsg_DidCommitProvisionalLoad_Params; | 16 struct FrameHostMsg_DidCommitProvisionalLoad_Params; |
16 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params; | 17 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params; |
17 | 18 |
18 namespace base { | 19 namespace base { |
19 class TimeTicks; | 20 class TimeTicks; |
20 } | 21 } |
21 | 22 |
22 namespace content { | 23 namespace content { |
23 | 24 |
24 class NavigationControllerImpl; | 25 class NavigationControllerImpl; |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 const Referrer& referrer, | 117 const Referrer& referrer, |
117 PageTransition page_transition, | 118 PageTransition page_transition, |
118 WindowOpenDisposition disposition, | 119 WindowOpenDisposition disposition, |
119 const GlobalRequestID& transferred_global_request_id, | 120 const GlobalRequestID& transferred_global_request_id, |
120 bool should_replace_current_entry, | 121 bool should_replace_current_entry, |
121 bool user_gesture) {} | 122 bool user_gesture) {} |
122 | 123 |
123 // PlzNavigate | 124 // PlzNavigate |
124 // Signal |render_frame_host| that a navigation is ready to commit (the | 125 // Signal |render_frame_host| that a navigation is ready to commit (the |
125 // response to the navigation request has been received). | 126 // response to the navigation request has been received). |
126 virtual void CommitNavigation(RenderFrameHostImpl* render_frame_host, | 127 virtual void CommitNavigation( |
127 const NavigationBeforeCommitInfo& info) {}; | 128 RenderFrameHostImpl* render_frame_host, |
| 129 scoped_ptr<FrameMsg_CommitNavigation_Params> commit_navigation_params) {} |
128 | 130 |
129 protected: | 131 protected: |
130 friend class base::RefCounted<Navigator>; | 132 friend class base::RefCounted<Navigator>; |
131 virtual ~Navigator() {} | 133 virtual ~Navigator() {} |
132 }; | 134 }; |
133 | 135 |
134 } // namespace content | 136 } // namespace content |
135 | 137 |
136 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ | 138 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ |
OLD | NEW |