| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index d287b6041d44110f5ad8f2716b6e61b653447a76..e38623e2ad0e8b7fa6a7c5949f40c36b3e7144f4 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -82,6 +82,7 @@
|
| #include "content/renderer/media/android/renderer_media_player_manager.h"
|
| #endif
|
|
|
| +struct FrameMsg_MixedContentFound_Params;
|
| struct FrameMsg_PostMessage_Params;
|
| struct FrameMsg_SerializeAsMHTML_Params;
|
| struct FrameMsg_TextTrackSettings_Params;
|
| @@ -913,11 +914,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
| const std::vector<content::FileChooserFileInfo>& files);
|
| void OnClearFocusedElement();
|
| void OnBlinkFeatureUsageReport(const std::set<int>& features);
|
| - void OnMixedContentFound(const GURL& main_resource_url,
|
| - const GURL& mixed_content_url,
|
| - RequestContextType request_context_type,
|
| - bool was_allowed,
|
| - bool had_redirect);
|
| + void OnMixedContentFound(const FrameMsg_MixedContentFound_Params& params);
|
| #if defined(OS_ANDROID)
|
| void OnActivateNearestFindResult(int request_id, float x, float y);
|
| void OnGetNearestFindResult(int request_id, float x, float y);
|
| @@ -1408,16 +1405,9 @@ class CONTENT_EXPORT RenderFrameImpl
|
| bool client_redirect;
|
| bool cache_disabled;
|
| blink::WebFormElement form;
|
| + blink::WebSourceLocation source_location;
|
|
|
| - PendingNavigationInfo(const NavigationPolicyInfo& info)
|
| - : navigation_type(info.navigationType),
|
| - policy(info.defaultPolicy),
|
| - replaces_current_history_item(info.replacesCurrentHistoryItem),
|
| - history_navigation_in_new_child_frame(
|
| - info.isHistoryNavigationInNewChildFrame),
|
| - client_redirect(info.isClientRedirect),
|
| - cache_disabled(info.isCacheDisabled),
|
| - form(info.form) {}
|
| + PendingNavigationInfo(const NavigationPolicyInfo& info);
|
| };
|
|
|
| // PlzNavigate: Contains information about a pending navigation to be sent to
|
|
|