| 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 5f5336349e3d1893436721640ad6913fcf113d10..8fa3fa21f2e3703e0244a5e4b58f0bffc5ffe2db 100644
|
| --- a/content/common/mojo/mojo_shell_connection_impl.h
|
| +++ b/content/common/mojo/mojo_shell_connection_impl.h
|
| @@ -66,13 +66,10 @@ class MojoShellConnectionImpl : public MojoShellConnection,
|
| void AddListener(Listener* listener) override;
|
| void RemoveListener(Listener* listener) override;
|
|
|
| - // Blocks the calling thread until a connection to the spawning shell is
|
| - // established, an Application request from it is bound, and the Initialize()
|
| - // method on that application is called.
|
| - void WaitForShell(mojo::ScopedMessagePipeHandle handle);
|
| + // Initiates a connection to the shell.
|
| + void ConnectToShell(mojo::ScopedMessagePipeHandle handle);
|
|
|
| bool external_;
|
| - bool initialized_;
|
| scoped_ptr<mojo::shell::RunnerConnection> runner_connection_;
|
| scoped_ptr<mojo::ShellConnection> shell_connection_;
|
| std::vector<Listener*> listeners_;
|
|
|