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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2378573005: [HBD] Blanket BLOCK on all non-HTTP(s) and non-FILE URLs for Flash. (Closed)
Patch Set: fix dat merge Created 4 years, 2 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/public/browser/plugin_service_filter.h ('k') | content/shell/browser/shell_plugin_service_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index ab4fd84d9ac2460bfd6fbccd0834096b4eed778c..ecd8707fdb398239efb7a16e8ed86330f0641b04 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2631,11 +2631,9 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
WebPluginInfo info;
std::string mime_type;
bool found = false;
- WebString top_origin = frame->top()->getSecurityOrigin().toString();
- Send(new FrameHostMsg_GetPluginInfo(routing_id_, params.url,
- blink::WebStringToGURL(top_origin),
- params.mimeType.utf8(), &found, &info,
- &mime_type));
+ Send(new FrameHostMsg_GetPluginInfo(
+ routing_id_, params.url, frame->top()->getSecurityOrigin(),
+ params.mimeType.utf8(), &found, &info, &mime_type));
if (!found)
return NULL;
« no previous file with comments | « content/public/browser/plugin_service_filter.h ('k') | content/shell/browser/shell_plugin_service_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698