chrome/browser/extensions/api/web_navigation/web_navigation_api.h - Issue 10834125: When committing a provisional load that didn't change the RVH, still abort pending navigations.

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: chrome/browser/extensions/api/web_navigation/web_navigation_api.h

Issue 10834125: When committing a provisional load that didn't change the RVH, still abort pending navigations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: patch for landing Created 8 years, 5 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

« no previous file with comments | « chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc ('k') | chrome/browser/extensions/api/web_navigation/web_navigation_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_navigation/web_navigation_api.h

diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h

index b73b7189444621e1d9d237f8ff2ea62a0ff0d3bd..5c5f3c4ab4ebb159ccdcf79dfabf3c76643f8ba8 100644

--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h

+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h

@@ -101,9 +101,11 @@ class WebNavigationTabObserver : public content::NotificationObserver,

// Creates and sends onErrorOccurred events for all on-going navigations. If

// |render_view_host| is non-NULL, only generates events for frames in this

- // render view host.

+ // render view host. If |id_to_skip| is given, no events are sent for that

+ // frame.

void SendErrorEvents(content::WebContents* web_contents,

- content::RenderViewHost* render_view_host);

+ content::RenderViewHost* render_view_host,

+ FrameNavigationState::FrameID id_to_skip);

// Tracks the state of the frames we are sending events for.

FrameNavigationState navigation_state_;