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

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

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: cleanup 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 e42eb30b8b48633eaef4d2b40176b2d8be930118..e9dbec77b36b0ea517de11f7225d5c6d5cba87ca 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -40,6 +40,7 @@ class BrowserDemuxerAndroid;
class GeolocationDispatcherHost;
class GpuMessageFilter;
class MessagePortMessageFilter;
+class MojoChannelInit;
class PeerConnectionTrackerHost;
class RendererMainThread;
class RenderWidgetHelper;
@@ -294,6 +295,9 @@ class CONTENT_EXPORT RenderProcessHostImpl
void SendDisableAecDumpToRenderer();
#endif
+ // Establishes the mojo channel to the renderer.
+ void CreateMojoChannel();
+
// The registered IPC listener objects. When this list is empty, we should
// delete ourselves.
IDMap<IPC::Listener> listeners_;
@@ -415,14 +419,18 @@ class CONTENT_EXPORT RenderProcessHostImpl
base::Callback<void(const std::string&)> webrtc_log_message_callback_;
#endif
- // Lives on the browser's ChildThread.
- base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
-
// Message filter and dispatcher for screen orientation.
ScreenOrientationDispatcherHost* screen_orientation_dispatcher_host_;
int worker_ref_count_;
+ // TODO(sky): remove ifdef, temporary until mac/android sorted out.
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+ scoped_ptr<MojoChannelInit> mojo_channel_init_;
+#endif
+
+ base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl);
};
« no previous file with comments | « no previous file | content/browser/renderer_host/render_process_host_impl.cc » ('j') | content/common/mojo/mojo_channel_init.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698