content/renderer/render_frame_impl.h - Issue 358973005: Navigation transitions: Pass is_transition_navigation flag up to the embedder

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 358973005: Navigation transitions: Pass is_transition_navigation flag up to the embedder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Test fix Created 6 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 | « content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.h

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

index 8b2c98dc285ca76642deace6ee84e944045e3a3a..2f4559af5dbf68e00e1e4ca819eeef31ee6bc5a2 100644

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

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

@@ -297,12 +297,7 @@ class CONTENT_EXPORT RenderFrameImpl

const blink::WebString& suggested_name);

// The WebDataSource::ExtraData* is assumed to be a DocumentState* subclass.

virtual blink::WebNavigationPolicy decidePolicyForNavigation(

- blink::WebLocalFrame* frame,

- blink::WebDataSource::ExtraData* extra_data,

- const blink::WebURLRequest& request,

- blink::WebNavigationType type,

- blink::WebNavigationPolicy default_policy,

- bool is_redirect);

+ const NavigationPolicyInfo& info);

virtual blink::WebHistoryItem historyItemForNewChildFrame(

blink::WebFrame* frame);

virtual void willSendSubmitEvent(blink::WebLocalFrame* frame,

@@ -311,7 +306,8 @@ class CONTENT_EXPORT RenderFrameImpl

const blink::WebFormElement& form);

virtual void didCreateDataSource(blink::WebLocalFrame* frame,

blink::WebDataSource* datasource);

- virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame);

+ virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame,

+ bool is_transition_navigation);

virtual void didReceiveServerRedirectForProvisionalLoad(

blink::WebLocalFrame* frame);

virtual void didFailProvisionalLoad(

@@ -507,12 +503,7 @@ class CONTENT_EXPORT RenderFrameImpl

// Virtual since overridden by WebTestProxy for layout tests.

virtual blink::WebNavigationPolicy DecidePolicyForNavigation(

RenderFrame* render_frame,

- blink::WebFrame* frame,

- blink::WebDataSource::ExtraData* extraData,

- const blink::WebURLRequest& request,

- blink::WebNavigationType type,

- blink::WebNavigationPolicy default_policy,

- bool is_redirect);

+ const NavigationPolicyInfo& info);

void OpenURL(blink::WebFrame* frame,

const GURL& url,

const Referrer& referrer,