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

Unified Diff: content/browser/renderer_host/render_process_host_impl.h

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/app/content_main_runner.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_process_host_impl.h
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index ac07b62211cd7b8e6812470a32f3e5b13edd3b3b..9ab3d81872b31e82c8a3fcf539a7aa2ed5f9fd5a 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -21,11 +21,8 @@
#include "content/public/browser/render_process_host.h"
#include "ipc/ipc_channel_proxy.h"
#include "ipc/ipc_platform_file.h"
-#include "ui/surface/transport_dib.h"
-
-#if defined(USE_MOJO)
#include "mojo/public/cpp/system/core.h"
-#endif
+#include "ui/surface/transport_dib.h"
struct ViewHostMsg_CompositorSurfaceBuffersSwapped_Params;
@@ -46,6 +43,7 @@ class GpuMessageFilter;
class MessagePortMessageFilter;
class PeerConnectionTrackerHost;
class RendererMainThread;
+class RenderProcessHostMojoImpl;
class RenderWidgetHelper;
class RenderWidgetHost;
class RenderWidgetHostImpl;
@@ -54,10 +52,6 @@ class ScreenOrientationDispatcherHost;
class StoragePartition;
class StoragePartitionImpl;
-#if defined(USE_MOJO)
-class RenderProcessHostMojoImpl;
-#endif
-
// Implements a concrete RenderProcessHost for the browser process for talking
// to actual renderer processes (as opposed to mocks).
//
@@ -241,10 +235,8 @@ class CONTENT_EXPORT RenderProcessHostImpl
void IncrementWorkerRefCount();
void DecrementWorkerRefCount();
-#if defined(USE_MOJO)
void SetWebUIHandle(int32 view_routing_id,
mojo::ScopedMessagePipeHandle handle);
-#endif
protected:
// A proxy for our IPC::Channel that lives on the IO thread (see
@@ -438,9 +430,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Records the time when the process starts surviving for workers for UMA.
base::TimeTicks survive_for_worker_start_time_;
-#if defined(USE_MOJO)
scoped_ptr<RenderProcessHostMojoImpl> render_process_host_mojo_;
-#endif
base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698