Index: mojo/shell/context.cc |
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc |
index 0eba764383ac43cd1403220fb563d7513fe5ebab..4b225a338c8d7eac109a9328cd81ff58c6a802e9 100644 |
--- a/mojo/shell/context.cc |
+++ b/mojo/shell/context.cc |
@@ -151,7 +151,7 @@ Context::Context() |
#endif |
} |
-Context::~Context() { |
+void Context::Shutdown() { |
// 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. |
@@ -160,7 +160,14 @@ Context::~Context() { |
scoped_ptr<ServiceLoader>(), |
GURL("mojo:mojo_view_manager")); |
#endif |
+ service_manager_.SetLoaderForURL(scoped_ptr<ServiceLoader>(), |
+ GURL("mojo:profile_service")); |
qsr
2014/07/21 08:09:20
This is probably outdated, the profile_service doe
tim (not reviewing)
2014/07/21 16:47:01
Oops, bad merge. Thanks!
|
service_manager_.set_default_loader(scoped_ptr<ServiceLoader>()); |
+ service_manager_.TerminateShellConnections(); |
+} |
+ |
+Context::~Context() { |
+ Shutdown(); |
} |
} // namespace shell |