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 f1c6e42c6015935f9724c90519cf9858463e8289..5a203688100f69651c933140768a6142857fc7e3 100644 |
--- a/mojo/application/public/cpp/lib/application_impl.cc |
+++ b/mojo/application/public/cpp/lib/application_impl.cc |
@@ -65,6 +65,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; |
@@ -73,6 +79,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()); |