| Index: mojo/public/cpp/application/lib/application_impl.cc
|
| diff --git a/mojo/public/cpp/application/lib/application_impl.cc b/mojo/public/cpp/application/lib/application_impl.cc
|
| index 557a615c88576c3aff07280a57f544872e916a2f..f47b58fdf3a538c523c24c37d1bca864d75d24bb 100644
|
| --- a/mojo/public/cpp/application/lib/application_impl.cc
|
| +++ b/mojo/public/cpp/application/lib/application_impl.cc
|
| @@ -19,9 +19,6 @@ void ApplicationImpl::ShellPtrWatcher::OnConnectionError() {
|
| impl_->OnShellError();
|
| }
|
|
|
| -ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate)
|
| - : delegate_(delegate), shell_watch_(this) {}
|
| -
|
| ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate,
|
| ScopedMessagePipeHandle shell_handle)
|
| : delegate_(delegate), shell_watch_(this) {
|
| @@ -31,7 +28,7 @@ ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate,
|
| ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate,
|
| MojoHandle shell_handle)
|
| : delegate_(delegate), shell_watch_(this) {
|
| - BindShell(shell_handle);
|
| + BindShell(MakeScopedHandle(MessagePipeHandle(shell_handle)));
|
| }
|
|
|
| void ApplicationImpl::ClearConnections() {
|
| @@ -72,10 +69,6 @@ void ApplicationImpl::BindShell(ScopedMessagePipeHandle shell_handle) {
|
| delegate_->Initialize(this);
|
| }
|
|
|
| -void ApplicationImpl::BindShell(MojoHandle shell_handle) {
|
| - BindShell(mojo::MakeScopedHandle(mojo::MessagePipeHandle(shell_handle)));
|
| -}
|
| -
|
| void ApplicationImpl::AcceptConnection(const String& requestor_url,
|
| ServiceProviderPtr service_provider) {
|
| internal::ServiceRegistry* registry = new internal::ServiceRegistry(
|
|
|