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

Unified Diff: content/renderer/npapi/webplugin_impl.cc

Issue 111613005: Start removing support for in-process NPAPI plugins. This was a debugging mode and was only support… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years 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/npapi/webplugin_impl.cc
===================================================================
--- content/renderer/npapi/webplugin_impl.cc (revision 242534)
+++ content/renderer/npapi/webplugin_impl.cc (working copy)
@@ -232,9 +232,8 @@
return false;
}
- WebPluginDelegate* plugin_delegate = CreatePluginDelegate();
- if (!plugin_delegate)
- return false;
+ WebPluginDelegateProxy* plugin_delegate = new WebPluginDelegateProxy(
+ this, mime_type_, render_view_, render_frame_);
// Store the plugin's unique identifier, used by the container to track its
// script objects.
@@ -638,22 +637,6 @@
return true;
}
-WebPluginDelegate* WebPluginImpl::CreatePluginDelegate() {
- bool in_process_plugin = RenderProcess::current()->UseInProcessPlugins();
- if (in_process_plugin) {
-#if defined(OS_WIN) && !defined(USE_AURA)
- return WebPluginDelegateImpl::Create(this, file_path_, mime_type_);
-#else
- // In-proc plugins aren't supported on non-Windows.
- NOTIMPLEMENTED();
- return NULL;
-#endif
- }
-
- return new WebPluginDelegateProxy(
- this, mime_type_, render_view_, render_frame_);
-}
-
WebPluginImpl::RoutingStatus WebPluginImpl::RouteToFrame(
const char* url,
bool is_javascript_url,
@@ -1407,7 +1390,8 @@
container_ = container_widget;
webframe_ = webframe;
- WebPluginDelegate* plugin_delegate = CreatePluginDelegate();
+ WebPluginDelegateProxy* plugin_delegate = new WebPluginDelegateProxy(
+ this, mime_type_, render_view_, render_frame_);
// Store the plugin's unique identifier, used by the container to track its
// script objects, and enable script objects (since Initialize may use them

Powered by Google App Engine
This is Rietveld 408576698