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

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: merge to trunk and update ifdefs 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
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 8ae38b4d37569d17b4a91794989ecd5b14620919..d598dc87def04aeb9a52ef6324c7a1c935d13c58 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -146,6 +146,11 @@
#include "content/renderer/npapi/plugin_channel_host.h"
#endif
+// TODO(sky): remove ifdef, temporary until mac sorted out.
+#if !defined(OS_MACOSX)
+#include "content/renderer/mojo_message_filter.h"
+#endif
+
using base::ThreadRestrictions;
using blink::WebDocument;
using blink::WebFrame;
@@ -393,6 +398,12 @@ void RenderThreadImpl::Init() {
AddFilter((new EmbeddedWorkerContextMessageFilter())->GetFilter());
+// TODO(sky): remove ifdef, temporary until mac sorted out.
+#if !defined(OS_MACOSX)
+ // MojoMessageFilter deletes itself as necessary.
+ new MojoMessageFilter(this);
darin (slow to review) 2014/03/14 22:03:36 Don't you need to call AddFilter? Oh, wait... I se
sky 2014/03/14 22:45:12 Done.
+#endif
+
GetContentClient()->renderer()->RenderThreadStarted();
InitSkiaEventTracer();

Powered by Google App Engine
This is Rietveld 408576698