Chromium Code Reviews| Index: chrome/browser/nacl_host/nacl_process_host.cc |
| =================================================================== |
| --- chrome/browser/nacl_host/nacl_process_host.cc (revision 126069) |
| +++ chrome/browser/nacl_host/nacl_process_host.cc (working copy) |
| @@ -279,7 +279,12 @@ |
| } |
| #if defined(OS_WIN) |
| if (RunningOnWOW64()) { |
| - NaClBrokerService::GetInstance()->OnLoaderDied(); |
| + // If nacl-gdb switch is not empty, NaCl loader has been launched |
|
Mark Seaborn
2012/03/14 23:33:14
"the nacl-gdb switch"
"the NaCl loader"
halyavin
2012/03/15 15:31:36
Done.
|
| + // without broker and so we shouldn't inform broker about its termination. |
|
Mark Seaborn
2012/03/14 23:33:14
"the broker"
halyavin
2012/03/15 15:31:36
Done.
|
| + if (CommandLine::ForCurrentProcess()->GetSwitchValuePath( |
| + switches::kNaClGdb).empty()) { |
| + NaClBrokerService::GetInstance()->OnLoaderDied(); |
| + } |
| } else { |
| debug_context_->SetChildProcessHost(NULL); |
| } |
| @@ -599,7 +604,7 @@ |
| if (base::OpenProcessHandleWithAccess( |
| peer_pid, |
| base::kProcessAccessDuplicateHandle | |
| - base::kProcessAccessQueryLimitedInfomation | |
| + base::kProcessAccessQueryInformation | |
|
Mark Seaborn
2012/03/14 23:33:14
Please document this change in the commit message.
halyavin
2012/03/15 15:31:36
Done.
|
| base::kProcessAccessWaitForTermination, |
| &process)) { |
| process_->SetHandle(process); |