Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2108)

Unified Diff: content/renderer/render_frame_impl.h

Issue 2765643002: Revert of PlzNavigate: send SourceLocation when mixed content is found (Closed)
Patch Set: Created 3 years, 9 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/common/frame_messages.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 361163142a2dc38f3c557b39a4049c8e3fff7fc2..9f6f3f03cab52a4546b40c22b135db27ab43b796 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -82,7 +82,6 @@
#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;
@@ -918,7 +917,11 @@
const std::vector<content::FileChooserFileInfo>& files);
void OnClearFocusedElement();
void OnBlinkFeatureUsageReport(const std::set<int>& features);
- void OnMixedContentFound(const FrameMsg_MixedContentFound_Params& params);
+ void OnMixedContentFound(const GURL& main_resource_url,
+ const GURL& mixed_content_url,
+ RequestContextType request_context_type,
+ bool was_allowed,
+ bool had_redirect);
#if defined(OS_ANDROID)
void OnActivateNearestFindResult(int request_id, float x, float y);
void OnGetNearestFindResult(int request_id, float x, float y);
@@ -1409,9 +1412,16 @@
bool client_redirect;
bool cache_disabled;
blink::WebFormElement form;
- blink::WebSourceLocation source_location;
-
- PendingNavigationInfo(const NavigationPolicyInfo& info);
+
+ 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) {}
};
// PlzNavigate: Contains information about a pending navigation to be sent to
« no previous file with comments | « content/common/frame_messages.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698