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

Unified Diff: third_party/mojo/src/mojo/edk/embedder/channel_init.h

Issue 877993004: Revert "Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « third_party/mojo/src/mojo/edk/embedder/DEPS ('k') | third_party/mojo/src/mojo/edk/embedder/channel_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mojo/src/mojo/edk/embedder/channel_init.h
diff --git a/third_party/mojo/src/mojo/edk/embedder/channel_init.h b/third_party/mojo/src/mojo/edk/embedder/channel_init.h
index 478da41b62eb868b4dbecf26656a6bcb0da17096..59b6694d8809d22650ab9b4c0969fdd0f7488b37 100644
--- a/third_party/mojo/src/mojo/edk/embedder/channel_init.h
+++ b/third_party/mojo/src/mojo/edk/embedder/channel_init.h
@@ -28,7 +28,7 @@ class MOJO_SYSTEM_IMPL_EXPORT ChannelInit {
~ChannelInit();
// Initializes the channel. This takes ownership of |file|. Returns the
- // primordial |MessagePipe| for the channel.
+ // primordial MessagePipe for the channel.
mojo::ScopedMessagePipeHandle Init(
base::PlatformFile file,
scoped_refptr<base::TaskRunner> io_thread_task_runner);
@@ -41,8 +41,11 @@ class MOJO_SYSTEM_IMPL_EXPORT ChannelInit {
// established. (This is a static method that takes a weak pointer to self,
// since we want to destroy the channel even if we're destroyed.)
static void OnCreatedChannel(base::WeakPtr<ChannelInit> self,
+ scoped_refptr<base::TaskRunner> io_thread,
ChannelInfo* channel);
+ scoped_refptr<base::TaskRunner> io_thread_task_runner_;
+
// If non-null the channel has been established.
ChannelInfo* channel_info_;
« no previous file with comments | « third_party/mojo/src/mojo/edk/embedder/DEPS ('k') | third_party/mojo/src/mojo/edk/embedder/channel_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698