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

Side by Side Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 1315009: Make DidProcessCrash a bit more solid and accurate on Windows (Closed)
Patch Set: now with a test Created 10 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/child_process_launcher.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "chrome/browser/nacl_host/nacl_process_host.h" 7 #include "chrome/browser/nacl_host/nacl_process_host.h"
8 8
9 #if defined(OS_POSIX) 9 #if defined(OS_POSIX)
10 #include <fcntl.h> 10 #include <fcntl.h>
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 111
112 return true; 112 return true;
113 } 113 }
114 114
115 void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) { 115 void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) {
116 set_handle(handle); 116 set_handle(handle);
117 OnProcessLaunched(); 117 OnProcessLaunched();
118 } 118 }
119 119
120 bool NaClProcessHost::DidChildCrash() { 120 bool NaClProcessHost::DidChildCrash() {
121 if (running_on_wow64_) { 121 if (running_on_wow64_)
122 bool child_exited; 122 return base::DidProcessCrash(NULL, handle());
123 return base::DidProcessCrash(&child_exited, handle());
124 }
125 return ChildProcessHost::DidChildCrash(); 123 return ChildProcessHost::DidChildCrash();
126 } 124 }
127 125
128 void NaClProcessHost::OnChildDied() { 126 void NaClProcessHost::OnChildDied() {
129 #if defined(OS_WIN) 127 #if defined(OS_WIN)
130 NaClBrokerService::GetInstance()->OnLoaderDied(); 128 NaClBrokerService::GetInstance()->OnLoaderDied();
131 #endif 129 #endif
132 ChildProcessHost::OnChildDied(); 130 ChildProcessHost::OnChildDied();
133 } 131 }
134 132
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 if (fnIsWow64Process != NULL) { 224 if (fnIsWow64Process != NULL) {
227 BOOL bIsWow64 = FALSE; 225 BOOL bIsWow64 = FALSE;
228 if (fnIsWow64Process(GetCurrentProcess(),&bIsWow64)) { 226 if (fnIsWow64Process(GetCurrentProcess(),&bIsWow64)) {
229 if (bIsWow64) { 227 if (bIsWow64) {
230 running_on_wow64_ = true; 228 running_on_wow64_ = true;
231 } 229 }
232 } 230 }
233 } 231 }
234 } 232 }
235 #endif 233 #endif
OLDNEW
« no previous file with comments | « chrome/browser/child_process_launcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698