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

Unified Diff: mojo/edk/system/node_controller.cc

Issue 1892123002: [mojo-edk] Disable clean shutdown behavior (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/node_controller.cc
diff --git a/mojo/edk/system/node_controller.cc b/mojo/edk/system/node_controller.cc
index 00164c05690a8856777dfc9d67e98ff1ab1268a4..54e7e3c443aa689bbe8845b1b5ea60730f4c5891 100644
--- a/mojo/edk/system/node_controller.cc
+++ b/mojo/edk/system/node_controller.cc
@@ -980,10 +980,10 @@ void NodeController::AttemptShutdownIfRequested() {
base::AutoLock lock(shutdown_lock_);
if (shutdown_callback_.is_null())
return;
- if (!node_->CanShutdownCleanly(true /* allow_local_ports */)) {
- DVLOG(2) << "Unable to cleanly shut down node " << name_ << ".";
- return;
- }
+
+ // TODO(rockot): We should return here if clean shutdown of |node_| is not
+ // yet possible. See http://crbug.com/589864 for why we don't.
+
callback = shutdown_callback_;
shutdown_callback_.Reset();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698