| Index: mojo/edk/embedder/platform_channel_pair.h
|
| diff --git a/mojo/edk/embedder/platform_channel_pair.h b/mojo/edk/embedder/platform_channel_pair.h
|
| index 873df04437bda06596f98317e79abcf64f9fa92f..dd2aec085fa89a07ed6cc71b38946d22e964e37f 100644
|
| --- a/mojo/edk/embedder/platform_channel_pair.h
|
| +++ b/mojo/edk/embedder/platform_channel_pair.h
|
| @@ -7,7 +7,6 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/process/launch.h"
|
| -#include "build/build_config.h"
|
| #include "mojo/edk/embedder/scoped_platform_handle.h"
|
| #include "mojo/edk/system/system_impl_export.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| @@ -21,26 +20,19 @@ namespace embedder {
|
|
|
| // It would be nice to refactor base/process/launch.h to have a more platform-
|
| // independent way of representing handles that are passed to child processes.
|
| -#if defined(OS_WIN)
|
| -using HandlePassingInformation = base::HandlesToInheritVector;
|
| -#elif defined(OS_POSIX)
|
| using HandlePassingInformation = base::FileHandleMappingVector;
|
| -#else
|
| -#error "Unsupported."
|
| -#endif
|
|
|
| // This is used to create a pair of |PlatformHandle|s that are connected by a
|
| -// suitable (platform-specific) bidirectional "pipe" (e.g., socket on POSIX,
|
| -// named pipe on Windows). The resulting handles can then be used in the same
|
| -// process (e.g., in tests) or between processes. (The "server" handle is the
|
| -// one that will be used in the process that created the pair, whereas the
|
| -// "client" handle is the one that will be used in a different process.)
|
| +// suitable (platform-specific) bidirectional "pipe" (e.g., Unix domain socket).
|
| +// The resulting handles can then be used in the same process (e.g., in tests)
|
| +// or between processes. (The "server" handle is the one that will be used in
|
| +// the process that created the pair, whereas the "client" handle is the one
|
| +// that will be used in a different process.)
|
| //
|
| // This class provides facilities for passing the client handle to a child
|
| // process. The parent should call |PrepareToPassClientHandlelToChildProcess()|
|
| // to get the data needed to do this, spawn the child using that data, and then
|
| -// call |ChildProcessLaunched()|. Note that on Windows this facility (will) only
|
| -// work on Vista and later (TODO(vtl)).
|
| +// call |ChildProcessLaunched()|.
|
| //
|
| // Note: |PlatformChannelPair()|, |PassClientHandleFromParentProcess()| and
|
| // |PrepareToPassClientHandleToChildProcess()| have platform-specific
|
| @@ -70,7 +62,6 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformChannelPair {
|
| // Prepares to pass the client channel to a new child process, to be launched
|
| // using |LaunchProcess()| (from base/launch.h). Modifies |*command_line| and
|
| // |*handle_passing_info| as needed.
|
| - // Note: For Windows, this method only works on Vista and later.
|
| void PrepareToPassClientHandleToChildProcess(
|
| base::CommandLine* command_line,
|
| HandlePassingInformation* handle_passing_info) const;
|
|
|