content/browser/frame_host/navigator_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/navigator_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/frame_host/navigator_delegate.h ('k') | content/browser/site_per_process_browsertest.cc » ('j') | content/browser/web_contents/web_contents_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigator_impl.cc

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

index 384bceeafbe37a8ccaab4546a517d86c8df019d1..7f8e47c9343226b104b5cb25ea9aae27681ddeea 100644

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

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

@@ -164,6 +164,8 @@ void NavigatorImpl::DidStartProvisionalLoad(

bool is_main_frame = render_frame_host->frame_tree_node()->IsMainFrame();

NavigationEntryImpl* pending_entry =

NavigationEntryImpl::FromNavigationEntry(controller_->GetPendingEntry());

+ if (pending_entry && is_error_page)

+ pending_entry->set_page_type(PAGE_TYPE_ERROR);

if (is_main_frame) {

// If there is no browser-initiated pending entry for this navigation and it

// is not for the error URL, create a pending entry using the current

@@ -538,6 +540,7 @@ void NavigatorImpl::DidNavigate(

delegate_->DidCommitProvisionalLoad(render_frame_host,

params.url,

+ params.url_is_unreachable,

transition_type);

}