| Index: trunk/src/content/browser/renderer_host/render_process_host_impl.h
|
| ===================================================================
|
| --- trunk/src/content/browser/renderer_host/render_process_host_impl.h (revision 258768)
|
| +++ trunk/src/content/browser/renderer_host/render_process_host_impl.h (working copy)
|
| @@ -23,11 +23,6 @@
|
| #include "ipc/ipc_platform_file.h"
|
| #include "ui/surface/transport_dib.h"
|
|
|
| -#if defined(USE_MOJO)
|
| -#include "content/common/mojo/render_process.mojom.h"
|
| -#include "mojo/public/bindings/remote_ptr.h"
|
| -#endif
|
| -
|
| struct ViewHostMsg_CompositorSurfaceBuffersSwapped_Params;
|
|
|
| namespace base {
|
| @@ -56,7 +51,7 @@
|
| class StoragePartitionImpl;
|
|
|
| #if defined(USE_MOJO)
|
| -class RenderProcessHostMojoImpl;
|
| +class MojoChannelInit;
|
| #endif
|
|
|
| // Implements a concrete RenderProcessHost for the browser process for talking
|
| @@ -242,11 +237,6 @@
|
| 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
|
| // browser_process.h)
|
| @@ -310,6 +300,11 @@
|
| void SendDisableAecDumpToRenderer();
|
| #endif
|
|
|
| +#if defined(USE_MOJO)
|
| + // Establishes the mojo channel to the renderer.
|
| + void CreateMojoChannel();
|
| +#endif
|
| +
|
| // The registered IPC listener objects. When this list is empty, we should
|
| // delete ourselves.
|
| IDMap<IPC::Listener> listeners_;
|
| @@ -437,7 +432,7 @@
|
| int worker_ref_count_;
|
|
|
| #if defined(USE_MOJO)
|
| - scoped_ptr<RenderProcessHostMojoImpl> render_process_host_mojo_;
|
| + scoped_ptr<MojoChannelInit> mojo_channel_init_;
|
| #endif
|
|
|
| base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
|
|
|