| Index: mojo/edk/embedder/embedder.h
|
| diff --git a/mojo/edk/embedder/embedder.h b/mojo/edk/embedder/embedder.h
|
| index cfaf0253b7127513b6f92f97eeb02c6ddd5d493f..11a352ccef0bcb0520683f2eee3ae26810949871 100644
|
| --- a/mojo/edk/embedder/embedder.h
|
| +++ b/mojo/edk/embedder/embedder.h
|
| @@ -71,8 +71,8 @@ MOJO_SYSTEM_IMPL_EXPORT Configuration* GetConfiguration();
|
| // |DestroyChannelOnIOThread()| (or |DestoryChannel()|) to tear down the
|
| // channel. Returns a handle to the bootstrap message pipe.
|
| MOJO_SYSTEM_IMPL_EXPORT ScopedMessagePipeHandle
|
| - CreateChannelOnIOThread(ScopedPlatformHandle platform_handle,
|
| - ChannelInfo** channel_info);
|
| +CreateChannelOnIOThread(ScopedPlatformHandle platform_handle,
|
| + ChannelInfo** channel_info);
|
|
|
| typedef base::Callback<void(ChannelInfo*)> DidCreateChannelCallback;
|
| // Creates a channel asynchronously; may be called from any thread.
|
| @@ -85,10 +85,10 @@ typedef base::Callback<void(ChannelInfo*)> DidCreateChannelCallback;
|
| // it will be called using |io_thread_task_runner|. Returns a handle to the
|
| // bootstrap message pipe.
|
| MOJO_SYSTEM_IMPL_EXPORT ScopedMessagePipeHandle
|
| - CreateChannel(ScopedPlatformHandle platform_handle,
|
| - scoped_refptr<base::TaskRunner> io_thread_task_runner,
|
| - DidCreateChannelCallback callback,
|
| - scoped_refptr<base::TaskRunner> callback_thread_task_runner);
|
| +CreateChannel(ScopedPlatformHandle platform_handle,
|
| + scoped_refptr<base::TaskRunner> io_thread_task_runner,
|
| + DidCreateChannelCallback callback,
|
| + scoped_refptr<base::TaskRunner> callback_thread_task_runner);
|
|
|
| // Destroys a channel that was created using either |CreateChannelOnIOThread()|
|
| // or |CreateChannel()|; must only be called from the I/O thread. |channel_info|
|
| @@ -113,14 +113,14 @@ MOJO_SYSTEM_IMPL_EXPORT void WillDestroyChannelSoon(ChannelInfo* channel_info);
|
| // failure, which is different from what you'd expect from a Mojo API, but it
|
| // makes for a more convenient embedder API.
|
| MOJO_SYSTEM_IMPL_EXPORT MojoResult
|
| - CreatePlatformHandleWrapper(ScopedPlatformHandle platform_handle,
|
| - MojoHandle* platform_handle_wrapper_handle);
|
| +CreatePlatformHandleWrapper(ScopedPlatformHandle platform_handle,
|
| + MojoHandle* platform_handle_wrapper_handle);
|
| // Retrieves the |PlatformHandle| that was wrapped into a |MojoHandle| (using
|
| // |CreatePlatformHandleWrapper()| above). Note that the |MojoHandle| must still
|
| // be closed separately.
|
| MOJO_SYSTEM_IMPL_EXPORT MojoResult
|
| - PassWrappedPlatformHandle(MojoHandle platform_handle_wrapper_handle,
|
| - ScopedPlatformHandle* platform_handle);
|
| +PassWrappedPlatformHandle(MojoHandle platform_handle_wrapper_handle,
|
| + ScopedPlatformHandle* platform_handle);
|
|
|
| } // namespace embedder
|
| } // namespace mojo
|
|
|