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

Unified Diff: content/common/mojo/mojo_channel_init.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: add TODO and merge to 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/browser/webui/web_ui_mojo_browsertest.cc ('k') | content/common/mojo/mojo_channel_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/mojo/mojo_channel_init.h
diff --git a/content/common/mojo/mojo_channel_init.h b/content/common/mojo/mojo_channel_init.h
index 44ba07d50ad3d4944f1c06267db944fe5e00425e..44fa8f47da269cb2fdcfb02c9844d7e2bbb65470 100644
--- a/content/common/mojo/mojo_channel_init.h
+++ b/content/common/mojo/mojo_channel_init.h
@@ -31,12 +31,20 @@ class CONTENT_EXPORT MojoChannelInit {
MojoChannelInit();
~MojoChannelInit();
+ // Initializes mojo. This is done implicitly when creating a MojoChannelInit,
+ // but can be done explicitly as necessary.
+ static void InitMojo();
+
// Inits the channel. This takes ownership of |file|.
void Init(base::PlatformFile file,
scoped_refptr<base::TaskRunner> io_thread_task_runner);
bool is_handle_valid() const { return bootstrap_message_pipe_.is_valid(); }
+ mojo::ScopedMessagePipeHandle bootstrap_message_pipe() {
+ return bootstrap_message_pipe_.Pass();
+ }
+
private:
// Invoked on the main thread once the channel has been established.
static void OnCreatedChannel(
« no previous file with comments | « content/browser/webui/web_ui_mojo_browsertest.cc ('k') | content/common/mojo/mojo_channel_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698