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

Side by Side Diff: trunk/src/content/browser/browser_child_process_host_impl.cc

Issue 290633006: Revert 270907 "Remove knowledge of nacl from content." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_impl.h" 5 #include "content/browser/browser_child_process_host_impl.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 170
171 base::ProcessHandle BrowserChildProcessHostImpl::GetHandle() const { 171 base::ProcessHandle BrowserChildProcessHostImpl::GetHandle() const {
172 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 172 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
173 DCHECK(child_process_.get()) 173 DCHECK(child_process_.get())
174 << "Requesting a child process handle before launching."; 174 << "Requesting a child process handle before launching.";
175 DCHECK(child_process_->GetHandle()) 175 DCHECK(child_process_->GetHandle())
176 << "Requesting a child process handle before launch has completed OK."; 176 << "Requesting a child process handle before launch has completed OK.";
177 return child_process_->GetHandle(); 177 return child_process_->GetHandle();
178 } 178 }
179 179
180 void BrowserChildProcessHostImpl::SetNaClDebugStubPort(int port) {
181 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
182 data_.nacl_debug_stub_port = port;
183 }
184
180 void BrowserChildProcessHostImpl::SetName(const base::string16& name) { 185 void BrowserChildProcessHostImpl::SetName(const base::string16& name) {
181 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 186 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
182 data_.name = name; 187 data_.name = name;
183 } 188 }
184 189
185 void BrowserChildProcessHostImpl::SetHandle(base::ProcessHandle handle) { 190 void BrowserChildProcessHostImpl::SetHandle(base::ProcessHandle handle) {
186 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 191 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
187 data_.handle = handle; 192 data_.handle = handle;
188 } 193 }
189 194
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 359
355 void BrowserChildProcessHostImpl::OnProcessExitedEarly( 360 void BrowserChildProcessHostImpl::OnProcessExitedEarly(
356 base::WaitableEvent* event) { 361 base::WaitableEvent* event) {
357 DeleteProcessWaitableEvent(event); 362 DeleteProcessWaitableEvent(event);
358 OnChildDisconnected(); 363 OnChildDisconnected();
359 } 364 }
360 365
361 #endif 366 #endif
362 367
363 } // namespace content 368 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698