content/renderer/render_frame_impl.h - Issue 1976573002: Only use pending navigation params for browser-initiated 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: content/renderer/render_frame_impl.h

Issue 1976573002: Only use pending navigation params for browser-initiated navigations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: consistency Created 4 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/renderer/render_frame_impl.h

diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h

index 670731fe8b7b6cac0b9500f9e188131f76d9007f..12fc54a44c2301e7543fc05a1466976cac8dbb7f 100644

--- a/content/renderer/render_frame_impl.h

+++ b/content/renderer/render_frame_impl.h

@@ -521,7 +521,8 @@ class CONTENT_EXPORT RenderFrameImpl

void didFinishLoad(blink::WebLocalFrame* frame) override;

void didNavigateWithinPage(blink::WebLocalFrame* frame,

const blink::WebHistoryItem& item,

- blink::WebHistoryCommitType commit_type) override;

+ blink::WebHistoryCommitType commit_type,

+ bool content_initiated) override;

void didUpdateCurrentHistoryItem() override;

void didChangeThemeColor() override;

void dispatchLoad() override;

@@ -965,7 +966,8 @@ class CONTENT_EXPORT RenderFrameImpl

// Sets the NavigationState on the DocumentState based on

// the value of |pending_navigation_params_|.

void UpdateNavigationState(DocumentState* document_state,

- bool was_within_same_page);

+ bool was_within_same_page,

+ bool content_initiated);

#if defined(OS_ANDROID)

blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(

« no previous file with comments | « content/public/test/render_view_test.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »