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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 376033002: Adding MimeHandlerView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pending-zork-patch2
Patch Set: Put all MimeHandlerView /w same mime-type to same process Created 6 years, 5 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index c7d721dbee6d9e60d95a36bfbf80344d5a6d3fd6..fb3c5089eb277eb3563a850daa15f1b2be2eb979 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1375,8 +1375,9 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
const blink::WebPluginParams& params) {
DCHECK_EQ(frame_, frame);
blink::WebPlugin* plugin = NULL;
+ int instance_id;
if (GetContentClient()->renderer()->OverrideCreatePlugin(
- this, frame, params, &plugin)) {
+ this, frame, params, &instance_id, &plugin)) {
return plugin;
}
@@ -1396,8 +1397,11 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
return NULL;
if (info.type == content::WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN) {
- return render_view_->GetBrowserPluginManager()->CreateBrowserPlugin(
- render_view_.get(), frame, true);
+ BrowserPlugin* plugin =
+ render_view_->GetBrowserPluginManager()->CreateBrowserPlugin(
+ render_view_.get(), frame, true);
+ plugin->AttachToPlugin(instance_id);
+ return plugin;
}

Powered by Google App Engine
This is Rietveld 408576698