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

Unified Diff: content/browser/renderer_host/render_message_filter.cc

Issue 1476873002: Adding <keygen> Content Setting (Final) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing naming. Created 4 years, 11 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/browser/renderer_host/render_message_filter.h ('k') | content/child/blink_platform_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 44114fd7e9e221e1c10995b3e4b254e3631313c1..cec7b8b1225fbbe99c24a5849041c8e0f26856cc 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -531,6 +531,7 @@ void RenderMessageFilter::OnCacheableMetadataAvailable(
void RenderMessageFilter::OnKeygen(uint32_t key_size_index,
const std::string& challenge_string,
const GURL& url,
+ const GURL& top_origin,
IPC::Message* reply_msg) {
if (!resource_context_)
return;
@@ -552,6 +553,13 @@ void RenderMessageFilter::OnKeygen(uint32_t key_size_index,
return;
}
+ if (!GetContentClient()->browser()->AllowKeygen(top_origin,
+ resource_context_)) {
+ RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string());
+ Send(reply_msg);
+ return;
+ }
+
resource_context_->CreateKeygenHandler(
key_size_in_bits,
challenge_string,
« no previous file with comments | « content/browser/renderer_host/render_message_filter.h ('k') | content/child/blink_platform_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698