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

Unified Diff: mojo/edk/embedder/embedder.h

Issue 1483823004: EDK: Move {platform_handle,scoped_platform_handle}.* to //mojo/edk/platform. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 1 month 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 | « mojo/edk/embedder/BUILD.gn ('k') | mojo/edk/embedder/embedder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/embedder/embedder.h
diff --git a/mojo/edk/embedder/embedder.h b/mojo/edk/embedder/embedder.h
index 0ae12490257053132451002fe728bc226eca2131..0ca05d6d70ad83206549da0cbafc252d8526b374 100644
--- a/mojo/edk/embedder/embedder.h
+++ b/mojo/edk/embedder/embedder.h
@@ -12,8 +12,8 @@
#include "base/callback.h"
#include "mojo/edk/embedder/channel_info_forward.h"
#include "mojo/edk/embedder/process_type.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
#include "mojo/edk/embedder/slave_info.h"
+#include "mojo/edk/platform/scoped_platform_handle.h"
#include "mojo/edk/platform/task_runner.h"
#include "mojo/public/cpp/system/message_pipe.h"
@@ -56,14 +56,15 @@ MojoResult AsyncWait(MojoHandle handle,
// failure, which is different from what you'd expect from a Mojo API, but it
// makes for a more convenient embedder API.
MojoResult CreatePlatformHandleWrapper(
- ScopedPlatformHandle platform_handle,
+ platform::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.
-MojoResult PassWrappedPlatformHandle(MojoHandle platform_handle_wrapper_handle,
- ScopedPlatformHandle* platform_handle);
+MojoResult PassWrappedPlatformHandle(
+ MojoHandle platform_handle_wrapper_handle,
+ platform::ScopedPlatformHandle* platform_handle);
// Initialialization/shutdown for interprocess communication (IPC) -------------
@@ -92,7 +93,7 @@ void InitIPCSupport(
util::RefPtr<platform::TaskRunner>&& delegate_thread_task_runner,
ProcessDelegate* process_delegate,
util::RefPtr<platform::TaskRunner>&& io_thread_task_runner,
- ScopedPlatformHandle platform_handle);
+ platform::ScopedPlatformHandle platform_handle);
// Shuts down the subsystem initialized by |InitIPCSupport()|. This must be
// called on the I/O thread (given to |InitIPCSupport()|). This completes
@@ -130,7 +131,7 @@ void ShutdownIPCSupport();
// TODO(vtl): The API is a little crazy with respect to the |ChannelInfo*|.
ScopedMessagePipeHandle ConnectToSlave(
SlaveInfo slave_info,
- ScopedPlatformHandle platform_handle,
+ platform::ScopedPlatformHandle platform_handle,
const base::Closure& did_connect_to_slave_callback,
util::RefPtr<platform::TaskRunner>&& did_connect_to_slave_runner,
std::string* platform_connection_id,
@@ -193,7 +194,7 @@ ScopedMessagePipeHandle ConnectToMaster(
// the "out" value |*channel_info| should be passed to |DestoryChannel()| to
// tear down the channel. Returns a handle to the bootstrap message pipe.
ScopedMessagePipeHandle CreateChannelOnIOThread(
- ScopedPlatformHandle platform_handle,
+ platform::ScopedPlatformHandle platform_handle,
ChannelInfo** channel_info);
// Creates a channel asynchronously; may be called from any thread.
@@ -207,7 +208,7 @@ ScopedMessagePipeHandle CreateChannelOnIOThread(
// Note: This should only be used to establish a channel with a process of type
// |ProcessType::NONE|. This function may be removed in the future.
ScopedMessagePipeHandle CreateChannel(
- ScopedPlatformHandle platform_handle,
+ platform::ScopedPlatformHandle platform_handle,
const base::Callback<void(ChannelInfo*)>& did_create_channel_callback,
util::RefPtr<platform::TaskRunner>&& did_create_channel_runner);
« no previous file with comments | « mojo/edk/embedder/BUILD.gn ('k') | mojo/edk/embedder/embedder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698