base/process/launch_win.cc - Issue 1124763003: Update from https://crrev.com/327068

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/process/launch_win.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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:

Index: base/process/launch_win.cc

diff --git a/base/process/launch_win.cc b/base/process/launch_win.cc

index c2bd295a0147441e708e0255649a5c1341d8d654..ebc19b8313093e6261999e909e4156ff9ea8d90e 100644

--- a/base/process/launch_win.cc

+++ b/base/process/launch_win.cc

@@ -219,7 +219,8 @@ Process LaunchProcess(const string16& cmdline,

if (0 == AssignProcessToJobObject(options.job_handle,

process_info.process_handle())) {

DLOG(ERROR) << "Could not AssignProcessToObject.";

- KillProcess(process_info.process_handle(), kProcessKilledExitCode, true);

+ Process scoped_process(process_info.TakeProcessHandle());

+ scoped_process.Terminate(kProcessKilledExitCode, true);

return Process();

}