content/browser/frame_host/navigation_controller_impl.cc - Issue 580133002: Update entry page type to include error pages when appropriate.

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/frame_host/navigation_controller_impl.cc

Issue 580133002: Update entry page type to include error pages when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix content_browsertests compilation. Created 6 years, 3 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 | « content/browser/browser_plugin/browser_plugin_guest.cc ('k') | content/browser/frame_host/navigator_delegate.h » ('j') | content/browser/web_contents/web_contents_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_controller_impl.cc

diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc

index 3b53e5844f1548ed984d2a1bfb7e6bc31a18fa66..17a958276075df3388af6ea6478f4e47c10de4f8 100644

--- a/content/browser/frame_host/navigation_controller_impl.cc

+++ b/content/browser/frame_host/navigation_controller_impl.cc

@@ -1038,8 +1038,9 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(

// Don't use the page type from the pending entry. Some interstitial page

// may have set the type to interstitial. Once we commit, however, the page

- // type must always be normal.

- new_entry->set_page_type(PAGE_TYPE_NORMAL);

+ // type must always be normal or error.

+ if (new_entry->GetPageType() != PAGE_TYPE_ERROR)

+ new_entry->set_page_type(PAGE_TYPE_NORMAL);

update_virtual_url = new_entry->update_virtual_url_with_url();

} else {

new_entry = new NavigationEntryImpl;