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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk 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/public/browser/web_ui_data_source.h ('k') | content/renderer/render_view_impl.cc » ('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 31575157bc08ba1173709418b40c4d29471526b8..a2a0ef47da65282c921d268a3c796d786f7c03c9 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -82,6 +82,7 @@
#include "content/renderer/media/video_capture_impl_manager.h"
#include "content/renderer/media/video_capture_message_filter.h"
#include "content/renderer/media/webrtc_identity_service.h"
+#include "content/renderer/mojo/mojo_render_process_observer.h"
#include "content/renderer/p2p/socket_dispatcher.h"
#include "content/renderer/render_process_impl.h"
#include "content/renderer/render_view_impl.h"
@@ -146,10 +147,6 @@
#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;
@@ -397,10 +394,8 @@ void RenderThreadImpl::Init() {
AddFilter((new EmbeddedWorkerContextMessageFilter())->GetFilter());
-#if defined(USE_MOJO)
// MojoRenderProcessObserver deletes itself as necessary.
new MojoRenderProcessObserver(this);
-#endif
GetContentClient()->renderer()->RenderThreadStarted();
« no previous file with comments | « content/public/browser/web_ui_data_source.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698