Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(647)

Unified Diff: mojo/public/cpp/application/lib/application_impl.cc

Issue 394903005: mojo: terminate apps if the shell goes away (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f5831aafa8ea8e2cd2ba004147f8eb92fe8def88..c164451445295e017dee9364366328d73f8eafe7 100644
--- a/mojo/public/cpp/application/lib/application_impl.cc
+++ b/mojo/public/cpp/application/lib/application_impl.cc
@@ -25,13 +25,19 @@ ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate,
BindShell(shell_handle);
}
-ApplicationImpl::~ApplicationImpl() {
+void ApplicationImpl::ClearConnections() {
for (ServiceRegistryList::iterator i(incoming_service_registries_.begin());
i != incoming_service_registries_.end(); ++i)
delete *i;
for (ServiceRegistryList::iterator i(outgoing_service_registries_.begin());
i != outgoing_service_registries_.end(); ++i)
delete *i;
+ incoming_service_registries_.clear();
+ outgoing_service_registries_.clear();
+}
+
+ApplicationImpl::~ApplicationImpl() {
+ ClearConnections();
}
ApplicationConnection* ApplicationImpl::ConnectToApplication(
@@ -71,4 +77,9 @@ void ApplicationImpl::AcceptConnection(const String& requestor_url,
incoming_service_registries_.push_back(registry);
}
+void ApplicationImpl::Terminate() {
+ ClearConnections();
+ TerminateImpl();
+}
+
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698