| Index: mojo/application/public/cpp/lib/application_impl.cc
|
| diff --git a/mojo/application/public/cpp/lib/application_impl.cc b/mojo/application/public/cpp/lib/application_impl.cc
|
| index 200bce4083a13c223f4f06e5d1314f7bf2d3bb44..2f86bb04d9e11267daaf3e26bc20ae2ef595f636 100644
|
| --- a/mojo/application/public/cpp/lib/application_impl.cc
|
| +++ b/mojo/application/public/cpp/lib/application_impl.cc
|
| @@ -66,6 +66,12 @@ ApplicationImpl::~ApplicationImpl() {
|
|
|
| ApplicationConnection* ApplicationImpl::ConnectToApplication(
|
| mojo::URLRequestPtr request) {
|
| + return ConnectToApplication(request.Pass(), base::Bind(&base::DoNothing));
|
| +}
|
| +
|
| +ApplicationConnection* ApplicationImpl::ConnectToApplication(
|
| + mojo::URLRequestPtr request,
|
| + const base::Closure& terminate_cb) {
|
| if (!shell_)
|
| return nullptr;
|
| ServiceProviderPtr local_services;
|
| @@ -74,6 +80,7 @@ ApplicationConnection* ApplicationImpl::ConnectToApplication(
|
| std::string application_url = request->url.To<std::string>();
|
| shell_->ConnectToApplication(request.Pass(), GetProxy(&remote_services),
|
| local_services.Pass());
|
| + remote_services.set_connection_error_handler(terminate_cb);
|
| internal::ServiceRegistry* registry = new internal::ServiceRegistry(
|
| this, application_url, application_url, remote_services.Pass(),
|
| local_request.Pass());
|
|
|