Index: content/renderer/render_frame_impl.h |
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h |
index 936f6772b209ba5db4708f4225119de52165b4b5..d9169844dc6bc96b18e8bffa31bfeaf55d752adb 100644 |
--- a/content/renderer/render_frame_impl.h |
+++ b/content/renderer/render_frame_impl.h |
@@ -278,12 +278,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, |
@@ -292,7 +287,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( |
@@ -484,12 +480,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, |