Chromium Code Reviews| Index: content/browser/frame_host/navigator_impl.h |
| diff --git a/content/browser/frame_host/navigator_impl.h b/content/browser/frame_host/navigator_impl.h |
| index c372e7edf90d57a48ca8c03075d9735c8384e8f4..f974576d6ee946a979c88458d91119817b8de086 100644 |
| --- a/content/browser/frame_host/navigator_impl.h |
| +++ b/content/browser/frame_host/navigator_impl.h |
| @@ -70,9 +70,11 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator { |
| const GlobalRequestID& transferred_global_request_id, |
| bool should_replace_current_entry, |
| bool user_gesture) override; |
| + void OnBeforeUnloadACK(FrameTreeNode* frame_tree_node, bool proceed) override; |
| void OnBeginNavigation(FrameTreeNode* frame_tree_node, |
| - const FrameHostMsg_BeginNavigation_Params& params, |
| - const CommonNavigationParams& common_params) override; |
| + const CommonNavigationParams& common_params, |
| + const BeginNavigationParams& begin_params, |
| + scoped_refptr<ResourceRequestBody> body) override; |
| void CommitNavigation(FrameTreeNode* frame_tree_node, |
| ResourceResponse* response, |
| scoped_ptr<StreamHandle> body) override; |
| @@ -109,14 +111,18 @@ class CONTENT_EXPORT NavigatorImpl : public Navigator { |
| RenderFrameHostImpl* render_frame_host, |
| const GURL& url); |
| - // PlzNavigate: sends a RequestNavigation IPC to the renderer to ask it to |
| - // navigate. If no live renderer is present, then the navigation request will |
| - // be sent directly to the ResourceDispatcherHost. |
| + // PlzNavigate: if needed, sends a BeforeUnload IPC to the renderer to ask it |
| + // to execute the BeforeUnload event. Otherwise, the navigation request will |
|
nasko
2015/02/02 21:17:43
nit: beforeUnload
clamy
2015/02/03 16:17:10
Done.
|
| + // be started. |
| bool RequestNavigation(FrameTreeNode* frame_tree_node, |
| const NavigationEntryImpl& entry, |
| NavigationController::ReloadType reload_type, |
| base::TimeTicks navigation_start); |
| + // PlzNavigate: sends the NavigationRequest for |frame_tree_node| to the |
| + // network stack so that it can start. |
| + void BeginNavigation(FrameTreeNode* frame_tree_node); |
| + |
| void RecordNavigationMetrics( |
| const LoadCommittedDetails& details, |
| const FrameHostMsg_DidCommitProvisionalLoad_Params& params, |