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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 801173002: Fix message routing for BrowserPlugin in iframe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More cleanup Created 6 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/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 5575adb86bfabf8d20175a8b9ed9833e7a5efd6e..40236597e6cd7f60689d0a1dc516e8f9533ef6a5 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -157,6 +157,10 @@
#include "content/child/npapi/np_channel_base.h"
#endif
+#if defined(ENABLE_EXTENSIONS)
+#include "content/renderer/browser_plugin/browser_plugin_manager.h"
+#endif
+
#if defined(ENABLE_PLUGINS)
#include "content/renderer/npapi/plugin_channel_host.h"
#endif
@@ -472,6 +476,11 @@ void RenderThreadImpl::Init() {
vc_manager_.reset(new VideoCaptureImplManager());
AddFilter(vc_manager_->video_capture_message_filter());
+#if defined(ENABLE_EXTENSIONS)
+ browser_plugin_manager_.reset(new BrowserPluginManager());
+ AddObserver(browser_plugin_manager_.get());
+#endif
+
#if defined(ENABLE_WEBRTC)
peer_connection_tracker_.reset(new PeerConnectionTracker());
AddObserver(peer_connection_tracker_.get());

Powered by Google App Engine
This is Rietveld 408576698