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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1162053003: Move BrowserPluginDelegate's lifetime mgmt out of content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 6 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 f67a40a2a53ed746c35dccead80b3d1f505057bb..e47fa4f639374fe8cc8ac565d603a9ff55a8a184 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1791,11 +1791,10 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
DCHECK_EQ(frame_, frame);
#if defined(ENABLE_PLUGINS)
if (info.type == WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN) {
- scoped_ptr<BrowserPluginDelegate> browser_plugin_delegate(
+ return BrowserPluginManager::Get()->CreateBrowserPlugin(
+ this,
GetContentClient()->renderer()->CreateBrowserPluginDelegate(
this, params.mimeType.utf8(), GURL(params.url)));
- return BrowserPluginManager::Get()->CreateBrowserPlugin(
- this, browser_plugin_delegate.Pass());
}
bool pepper_plugin_was_registered = false;
@@ -1911,11 +1910,10 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
}
if (base::UTF16ToUTF8(params.mimeType) == kBrowserPluginMimeType) {
- scoped_ptr<BrowserPluginDelegate> browser_plugin_delegate(
+ return BrowserPluginManager::Get()->CreateBrowserPlugin(
+ this,
GetContentClient()->renderer()->CreateBrowserPluginDelegate(this,
kBrowserPluginMimeType, GURL(params.url)));
- return BrowserPluginManager::Get()->CreateBrowserPlugin(
- this, browser_plugin_delegate.Pass());
}
#if defined(ENABLE_PLUGINS)

Powered by Google App Engine
This is Rietveld 408576698