Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1871)

Unified Diff: content/browser/frame_host/navigation_request.h

Issue 2901833002: Create NavigationHandle after beforeunload with PlzNavigate. (Closed)
Patch Set: small fix from jam Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_request.h
diff --git a/content/browser/frame_host/navigation_request.h b/content/browser/frame_host/navigation_request.h
index ca6d969d32e93519b00ab8c8ca3e5e733692360f..12b3e7ef5414ddf4c634f1a32081a5690de1712c 100644
--- a/content/browser/frame_host/navigation_request.h
+++ b/content/browser/frame_host/navigation_request.h
@@ -93,6 +93,7 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate {
// threading subtleties.
static std::unique_ptr<NavigationRequest> CreateRendererInitiated(
FrameTreeNode* frame_tree_node,
+ NavigationEntryImpl* entry,
const CommonNavigationParams& common_params,
const BeginNavigationParams& begin_params,
int current_history_list_offset,
@@ -111,6 +112,11 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate {
return request_params_;
}
+ // Updates the navigation start time.
+ void set_navigation_start_time(const base::TimeTicks& time) {
+ common_params_.navigation_start = time;
+ }
+
NavigationURLLoader* loader_for_testing() const { return loader_.get(); }
NavigationState state() const { return state_; }
@@ -150,7 +156,7 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate {
// Creates a NavigationHandle. This should be called after any previous
// NavigationRequest for the FrameTreeNode has been destroyed.
- void CreateNavigationHandle(int pending_nav_entry_id);
+ void CreateNavigationHandle();
// Transfers the ownership of the NavigationHandle to |render_frame_host|.
// This should be called when the navigation is ready to commit, because the
@@ -165,6 +171,8 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate {
on_start_checks_complete_closure_ = closure;
}
+ int nav_entry_id() const { return nav_entry_id_; }
+
private:
NavigationRequest(FrameTreeNode* frame_tree_node,
const CommonNavigationParams& common_params,
@@ -229,6 +237,7 @@ class CONTENT_EXPORT NavigationRequest : public NavigationURLLoaderDelegate {
RestoreType restore_type_;
bool is_view_source_;
int bindings_;
+ int nav_entry_id_ = 0;
// Whether the navigation should be sent to a renderer a process. This is
// true, except for 204/205 responses and downloads.
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl_browsertest.cc ('k') | content/browser/frame_host/navigation_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698