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

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

Issue 206923002: Adds plumbing to pass WebUI mojo::Handle from browser to renderer (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
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 1fc85d202c7c796d0ba648c551d76f0abeb30b6b..2afd97d8f5129d699ac0dfdbce38b82e6c8f9e4d 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -23,6 +23,11 @@
#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 {
@@ -51,7 +56,7 @@ class StoragePartition;
class StoragePartitionImpl;
#if defined(USE_MOJO)
-class MojoChannelInit;
+class RenderProcessHostMojoImpl;
#endif
// Implements a concrete RenderProcessHost for the browser process for talking
@@ -237,6 +242,10 @@ class CONTENT_EXPORT RenderProcessHostImpl
void IncrementWorkerRefCount();
void DecrementWorkerRefCount();
+#if defined(USE_MOJO)
+ void SetWebUIHandle(int32 view_routing_id, mojo::ScopedHandle handle);
darin (slow to review) 2014/03/21 00:04:52 nit: should this use ScopedMessagePipeHandle inste
sky 2014/03/21 03:19:16 Done.
+#endif
+
protected:
// A proxy for our IPC::Channel that lives on the IO thread (see
// browser_process.h)
@@ -300,11 +309,6 @@ class CONTENT_EXPORT RenderProcessHostImpl
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_;
@@ -432,7 +436,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
int worker_ref_count_;
#if defined(USE_MOJO)
- scoped_ptr<MojoChannelInit> mojo_channel_init_;
+ scoped_ptr<RenderProcessHostMojoImpl> render_process_host_mojo_;
#endif
base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698