PlzNavigate: send SourceLocation when mixed content is found

content/renderer/render_frame_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 64 matching lines @@
 #include "url/origin.h"
 
 #if BUILDFLAG(ENABLE_PLUGINS)
 #include "content/renderer/pepper/plugin_power_saver_helper.h"
 #endif
 
 #if defined(OS_ANDROID)
 #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;
 
 namespace blink {
 class WebContentDecryptionModule;
 class WebPresentationClient;
 class WebPushClient;
 class WebSecurityOrigin;
 enum class WebCachePolicy;
@@ skipping 811 matching lines @@
               const base::string16& search_text,
               const blink::WebFindOptions& options);
   void OnClearActiveFindMatch();
   void OnStopFinding(StopFindAction action);
   void OnEnableViewSourceMode();
   void OnSuppressFurtherDialogs();
   void OnFileChooserResponse(
       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);
   void OnFindMatchRects(int current_version);
 #endif
 
 #if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
 #if defined(OS_MACOSX)
   void OnSelectPopupMenuItem(int selected_index);
 #else
@@ skipping 470 matching lines @@
   // The navigation is sent to the browser in didStartProvisionalLoad().
   // Please see the BeginNavigation() for information.
   struct PendingNavigationInfo {
     blink::WebNavigationType navigation_type;
     blink::WebNavigationPolicy policy;
     bool replaces_current_history_item;
     bool history_navigation_in_new_child_frame;
     bool client_redirect;
     bool cache_disabled;
     blink::WebFormElement form;
+    blink::WebSourceLocation location;

[nasko, 2017/03/15 18:29:08]

nit: source_location, otherwise it reads a bit too closely to a url location.

[clamy, 2017/03/16 15:07:03]

Done.

 
-    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
   // the browser. This state is allocated in decidePolicyForNavigation() and
   // is used and released in didStartProvisionalLoad().
   std::unique_ptr<PendingNavigationInfo> pending_navigation_info_;
 
   base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_