Chromium Code Reviews| Index: content/renderer/render_frame_impl.h |
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h |
| index 117cc0b6a9194e1c30c41381e96def18d1227bf2..caced4958b3bc9e97528a34da6c3b51f7a24a481 100644 |
| --- a/content/renderer/render_frame_impl.h |
| +++ b/content/renderer/render_frame_impl.h |
| @@ -269,12 +269,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, |
| @@ -283,7 +278,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( |
| @@ -478,11 +474,13 @@ class CONTENT_EXPORT RenderFrameImpl |
| const blink::WebURLRequest& request, |
| blink::WebNavigationType type, |
| blink::WebNavigationPolicy default_policy, |
| - bool is_redirect); |
| + bool is_redirect, |
| + bool is_transition_navigation); |
|
nasko
2014/07/03 09:39:31
Why not collapse all of these also to a Navigation
oystein (OOO til 10th of July)
2014/07/22 00:02:43
Done.
|
| void OpenURL(blink::WebFrame* frame, |
| const GURL& url, |
| const Referrer& referrer, |
| - blink::WebNavigationPolicy policy); |
| + blink::WebNavigationPolicy policy, |
| + bool is_transition_navigation); |
| // Update current main frame's encoding and send it to browser window. |
| // Since we want to let users see the right encoding info from menu |