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

Unified Diff: base/process/process_posix.cc

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 years, 9 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 | « base/process/process_metrics_unittest.cc ('k') | base/process/process_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/process/process_posix.cc
diff --git a/base/process/process_posix.cc b/base/process/process_posix.cc
index a36bf77ff21dd5862002ba5c1d63029df0a7bc0e..1c4210b0fe590380503ced3c94cf98d01405ff44 100644
--- a/base/process/process_posix.cc
+++ b/base/process/process_posix.cc
@@ -287,12 +287,13 @@ void Process::Close() {
// end up w/ a zombie when it does finally exit.
}
-void Process::Terminate(int result_code) {
+bool Process::Terminate(int result_code, bool wait) const {
// result_code isn't supportable.
DCHECK(IsValid());
// We don't wait here. It's the responsibility of other code to reap the
// child.
- KillProcess(process_, result_code, false);
+ // TODO(rvargas) crbug/417532: Move the implementation here.
+ return KillProcess(process_, result_code, wait);
}
bool Process::WaitForExit(int* exit_code) {
@@ -324,4 +325,4 @@ int Process::GetPriority() const {
return getpriority(PRIO_PROCESS, process_);
}
-} // namspace base
+} // namespace base
« no previous file with comments | « base/process/process_metrics_unittest.cc ('k') | base/process/process_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698