Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index cbff866790809b5c268f9321e2219db4ef4498c8..e7a6422d2b13abad0b08e7dbf13393d9274b064f 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -5,6 +5,7 @@ |
#include "content/renderer/render_frame_impl.h" |
#include <map> |
+#include <set> |
jam
2017/01/11 16:38:06
no need, it's in the header by definition
carlosk
2017/01/11 22:15:03
Done.
|
#include <string> |
#include <utility> |
#include <vector> |
@@ -1575,6 +1576,10 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { |
OnSetHasReceivedUserGesture) |
IPC_MESSAGE_HANDLER(FrameMsg_RunFileChooserResponse, OnFileChooserResponse) |
IPC_MESSAGE_HANDLER(FrameMsg_ClearFocusedElement, OnClearFocusedElement) |
+ IPC_MESSAGE_HANDLER(FrameMsg_BlinkFeatureUsageReport, |
+ OnBlinkFeatureUsageReport) |
+ IPC_MESSAGE_HANDLER(FrameMsg_MixedContentFound, |
+ OnMixedContentFoundByTheBrowser) |
#if defined(OS_ANDROID) |
IPC_MESSAGE_HANDLER(FrameMsg_ActivateNearestFindResult, |
OnActivateNearestFindResult) |
@@ -5644,6 +5649,23 @@ void RenderFrameImpl::OnClearFocusedElement() { |
webview->clearFocusedElement(); |
} |
+void RenderFrameImpl::OnBlinkFeatureUsageReport(const std::set<int>& features) { |
+ frame_->blinkFeatureUsageReport(features); |
+} |
+ |
+void RenderFrameImpl::OnMixedContentFoundByTheBrowser( |
+ const GURL& main_resource_url, |
+ const GURL& mixed_content_url, |
+ RequestContextType request_context_type, |
+ bool was_allowed, |
+ bool had_redirect) { |
+ auto request_context = |
+ static_cast<blink::WebURLRequest::RequestContext>(request_context_type); |
+ frame_->mixedContentFoundByTheBrowser(main_resource_url, mixed_content_url, |
+ request_context, was_allowed, |
+ had_redirect); |
+} |
+ |
#if defined(OS_ANDROID) |
void RenderFrameImpl::OnActivateNearestFindResult(int request_id, |
float x, |