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

Side by Side Diff: content/browser/browser_child_process_host.cc

Issue 7870008: Wait properly for renderer crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 9 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/browser_child_process_host.h" 5 #include "content/browser/browser_child_process_host.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches( 83 content::GetContentClient()->browser()->AppendExtraCommandLineSwitches(
84 cmd_line, id()); 84 cmd_line, id());
85 85
86 child_process_.reset(new ChildProcessLauncher( 86 child_process_.reset(new ChildProcessLauncher(
87 #if defined(OS_WIN) 87 #if defined(OS_WIN)
88 exposed_dir, 88 exposed_dir,
89 #elif defined(OS_POSIX) 89 #elif defined(OS_POSIX)
90 use_zygote, 90 use_zygote,
91 environ, 91 environ,
92 channel()->GetClientFileDescriptor(), 92 channel()->TakeClientFileDescriptor(),
93 #endif 93 #endif
94 cmd_line, 94 cmd_line,
95 &client_)); 95 &client_));
96 } 96 }
97 97
98 base::ProcessHandle BrowserChildProcessHost::GetChildProcessHandle() const { 98 base::ProcessHandle BrowserChildProcessHost::GetChildProcessHandle() const {
99 DCHECK(child_process_.get()) 99 DCHECK(child_process_.get())
100 << "Requesting a child process handle before launching."; 100 << "Requesting a child process handle before launching.";
101 DCHECK(child_process_->GetHandle()) 101 DCHECK(child_process_->GetHandle())
102 << "Requesting a child process handle before launch has completed OK."; 102 << "Requesting a child process handle before launch has completed OK.";
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 202
203 return *iterator_; 203 return *iterator_;
204 } while (true); 204 } while (true);
205 205
206 return NULL; 206 return NULL;
207 } 207 }
208 208
209 bool BrowserChildProcessHost::Iterator::Done() { 209 bool BrowserChildProcessHost::Iterator::Done() {
210 return iterator_ == g_child_process_list.Get().end(); 210 return iterator_ == g_child_process_list.Get().end();
211 } 211 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698