| Index: content/public/common/mojo_shell_connection.h
|
| diff --git a/content/public/common/mojo_shell_connection.h b/content/public/common/mojo_shell_connection.h
|
| index af4cce1341484871827a2450e83114662ce8155e..41f82b7fecb276b332173ddb211215ed7bd19c5b 100644
|
| --- a/content/public/common/mojo_shell_connection.h
|
| +++ b/content/public/common/mojo_shell_connection.h
|
| @@ -6,6 +6,7 @@
|
| #define CONTENT_PUBLIC_COMMON_MOJO_SHELL_CONNECTION_H_
|
|
|
| #include "content/common/content_export.h"
|
| +#include "mojo/public/cpp/system/message_pipe.h"
|
|
|
| namespace mojo {
|
| class ApplicationConnection;
|
| @@ -29,7 +30,6 @@ class CONTENT_EXPORT MojoShellConnection {
|
| virtual bool ConfigureIncomingConnection(
|
| mojo::ApplicationConnection* connection) = 0;
|
|
|
| - protected:
|
| virtual ~Listener() {}
|
| };
|
|
|
| @@ -42,11 +42,21 @@ class CONTENT_EXPORT MojoShellConnection {
|
| // created on.
|
| static void Destroy();
|
|
|
| + // 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.
|
| + virtual void BindToCommandLinePlatformChannel() = 0;
|
| +
|
| + // Same as BindToCommandLinePlatformChannel(), but receives a handle instead
|
| + // of looking for one on the command line.
|
| + virtual void BindToMessagePipe(mojo::ScopedMessagePipeHandle handle) = 0;
|
| +
|
| // Returns an Initialized() ApplicationImpl.
|
| virtual mojo::ApplicationImpl* GetApplication() = 0;
|
|
|
| // [De]Register an impl of Listener that will be consulted when the wrapped
|
| // ApplicationImpl exposes services to inbound connections.
|
| + // Registered listeners are owned by this MojoShellConnection.
|
| virtual void AddListener(Listener* listener) = 0;
|
| virtual void RemoveListener(Listener* listener) = 0;
|
|
|
|
|