content/browser/loader/resource_dispatcher_host_impl.h - Issue 475783002: PlzNavigate: add cancel navigation logic for uncommitted requests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.h

Issue 475783002: PlzNavigate: add cancel navigation logic for uncommitted requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Ignores commits of stale navigation requests Created 6 years, 4 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

« content/browser/frame_host/render_frame_host_manager_unittest.cc ('K') | « content/browser/frame_host/render_frame_host_manager_unittest.cc ('k') | content/browser/loader/resource_dispatcher_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/loader/resource_dispatcher_host_impl.h

diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h

index 269af9215f943228470130f189116c1b93a1381d..88eacb27c86b5024763c27469b132a354c15c463 100644

--- a/content/browser/loader/resource_dispatcher_host_impl.h

+++ b/content/browser/loader/resource_dispatcher_host_impl.h

@@ -240,9 +240,17 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl

// Called by NavigationRequest to start a navigation request in the node

clamy 2014/08/21 11:48:52 nit: could you add a //PlzNavigate line before tha

carlosk 2014/08/21 16:28:04 Done.

// identified by |frame_node_id|.

- void NavigationRequest(const NavigationRequestInfo& info,

- scoped_refptr<ResourceRequestBody> request_body,

- int64 frame_node_id);

+ void StartNavigationRequest(const NavigationRequestInfo& info,

+ scoped_refptr<ResourceRequestBody> request_body,

+ int64 navigation_request_id,

+ int64 frame_node_id);

+ // PlzNavigate

+ // Called by NavigationRequest to cancel a navigation request with the

+ // provided |navigation_request_id| from the node identified by

+ // |frame_node_id|.

+ void CancelNavigationRequest(int64 navigation_request_id,

+ int64 frame_node_id);

private:

friend class ResourceDispatcherHostTest;