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

Unified Diff: services/dart/content_handler_main.cc

Issue 1688793002: Fix shutdown race when running Dart on the message loop (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | tonic/dart_message_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/dart/content_handler_main.cc
diff --git a/services/dart/content_handler_main.cc b/services/dart/content_handler_main.cc
index ad599cc096e18051018c21c42cd8d43a04481466..219f2be310a88b39233aa58d7c9fe7d2cd42ca44 100644
--- a/services/dart/content_handler_main.cc
+++ b/services/dart/content_handler_main.cc
@@ -140,7 +140,11 @@ class DartContentHandlerApp : public mojo::ApplicationDelegate {
default_strict_(false),
run_on_message_loop_(false) {}
- ~DartContentHandlerApp() override {}
+ ~DartContentHandlerApp() override {
+ // Shutdown the controller.
+ mojo::dart::DartController::Shutdown();
+ delete service_connector_;
+ }
void ExtractApplication(base::FilePath* application_dir,
mojo::URLResponsePtr response,
@@ -242,13 +246,6 @@ class DartContentHandlerApp : public mojo::ApplicationDelegate {
return true;
}
- // Overridden from ApplicationDelegate:
- void Quit() override {
- // Shutdown the controller.
- mojo::dart::DartController::Shutdown();
- delete service_connector_;
- }
-
mojo::TracingImpl tracing_;
DartContentHandler content_handler_;
DartContentHandler strict_content_handler_;
« no previous file with comments | « no previous file | tonic/dart_message_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698