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

Unified Diff: mojo/shell/context.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/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 0810a17a6bf0787131c296fb23d43e240994311f..1f2eb8b9c61458e7a774aa73558f609d1281fbeb 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -153,7 +153,7 @@ void Context::Init() {
#endif
}
-void Context::Shutdown() {
+Context::~Context() {
// mojo_view_manager uses native_viewport. Destroy mojo_view_manager first so
// that there aren't shutdown ordering issues. Once native viewport service is
// moved into its own process this can likely be nuked.
@@ -163,11 +163,6 @@ void Context::Shutdown() {
GURL("mojo:mojo_view_manager"));
#endif
service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
- service_manager_.TerminateShellConnections();
-}
-
-Context::~Context() {
- Shutdown();
}
} // namespace shell

Powered by Google App Engine
This is Rietveld 408576698