| Index: content/common/mojo/mojo_shell_connection_impl.h
|
| diff --git a/content/common/mojo/mojo_shell_connection_impl.h b/content/common/mojo/mojo_shell_connection_impl.h
|
| index 8891acba7bc1e54927325891a6c4f7aa51cffe2d..872ee2ba2b72141ae7b1f343e9c8525d4a5ba5c1 100644
|
| --- a/content/common/mojo/mojo_shell_connection_impl.h
|
| +++ b/content/common/mojo/mojo_shell_connection_impl.h
|
| @@ -28,13 +28,22 @@ class MojoShellConnectionImpl : public MojoShellConnection,
|
| public mojo::ApplicationDelegate {
|
| public:
|
| // Creates an instance of this class and stuffs it in TLS on the calling
|
| - // thread. Retrieve it using MojoShellConnection::Get(). Blocks the calling
|
| - // thread until calling GetApplication() will return an Initialized()
|
| - // application with a bound ShellPtr.
|
| + // thread. Retrieve it using MojoShellConnection::Get().
|
| static void Create();
|
| - // Same as Create(), but receives a handle instead of looking for one on the
|
| - // command line.
|
| - static void CreateWithMessagePipe(mojo::ScopedMessagePipeHandle handle);
|
| +
|
| + // Will return null if no connection has been established (either because it
|
| + // hasn't happened yet or the application was not spawned from the external
|
| + // Mojo shell).
|
| + static MojoShellConnectionImpl* Get();
|
| +
|
| + // Blocks the calling thread until calling GetApplication() will return an
|
| + // Initialized() application with a bound ShellPtr. This call is a no-op
|
| + // if the connection has already been initialized.
|
| + void BindToCommandLinePlatformChannel();
|
| +
|
| + // Same as BindToCommandLinePlatformChannel(), but receives a |handle| instead
|
| + // of looking for one on the command line.
|
| + void BindToMessagePipe(mojo::ScopedMessagePipeHandle handle);
|
|
|
| private:
|
| MojoShellConnectionImpl();
|
|
|