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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 195993010: Adds the ability for the renderer to create the mojo channel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use_mojo Created 6 years, 9 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/renderer/mojo/mojo_render_process_observer.cc ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 47662bb15f0929e37da18be1069d8472bcf85126..ccdb4cc8fa9b96bb26a7bf33d086ced0667d421c 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -146,6 +146,10 @@
#include "content/renderer/npapi/plugin_channel_host.h"
#endif
+#if defined(USE_MOJO)
+#include "content/renderer/mojo/mojo_render_process_observer.h"
+#endif
+
using base::ThreadRestrictions;
using blink::WebDocument;
using blink::WebFrame;
@@ -393,6 +397,11 @@ void RenderThreadImpl::Init() {
AddFilter((new EmbeddedWorkerContextMessageFilter())->GetFilter());
+#if defined(USE_MOJO)
+ // MojoRenderProcessObserver deletes itself as necessary.
+ new MojoRenderProcessObserver(this);
+#endif
+
GetContentClient()->renderer()->RenderThreadStarted();
InitSkiaEventTracer();
« no previous file with comments | « content/renderer/mojo/mojo_render_process_observer.cc ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698