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

Side by Side Diff: chrome/app/nacl_fork_delegate_linux.cc

Issue 8381029: Move ZygoteForkDelegateLinux to content/public/app. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 9 years, 2 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
« no previous file with comments | « chrome/app/nacl_fork_delegate_linux.h ('k') | chrome/common/nacl_fork_delegate_linux.h » ('j') | 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) 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 "chrome/common/nacl_fork_delegate_linux.h" 5 #include "chrome/app/nacl_fork_delegate_linux.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/socket.h> 9 #include <sys/socket.h>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/eintr_wrapper.h" 13 #include "base/eintr_wrapper.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/file_path.h" 15 #include "base/file_path.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/process_util.h" 17 #include "base/process_util.h"
18 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 18 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
19 #include "content/common/unix_domain_socket_posix.h" 19 #include "content/common/unix_domain_socket_posix.h"
20 #include "content/common/zygote_fork_delegate_linux.h"
21 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
22 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/nacl_helper_linux.h" 22 #include "chrome/common/nacl_helper_linux.h"
24 23
25 NaClForkDelegate::NaClForkDelegate() 24 NaClForkDelegate::NaClForkDelegate()
26 : status_(kNaClHelperUnused), 25 : status_(kNaClHelperUnused),
27 sandboxed_(false), 26 sandboxed_(false),
28 fd_(-1) {} 27 fd_(-1) {}
29 28
30 const char kNaClHelperAtZero[] = "--at-zero"; 29 const char kNaClHelperAtZero[] = "--at-zero";
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 141
143 bool NaClForkDelegate::AckChild(const int fd, 142 bool NaClForkDelegate::AckChild(const int fd,
144 const std::string& channel_switch) { 143 const std::string& channel_switch) {
145 int nwritten = HANDLE_EINTR(write(fd, channel_switch.c_str(), 144 int nwritten = HANDLE_EINTR(write(fd, channel_switch.c_str(),
146 channel_switch.length())); 145 channel_switch.length()));
147 if (nwritten != static_cast<int>(channel_switch.length())) { 146 if (nwritten != static_cast<int>(channel_switch.length())) {
148 return false; 147 return false;
149 } 148 }
150 return true; 149 return true;
151 } 150 }
OLDNEW
« no previous file with comments | « chrome/app/nacl_fork_delegate_linux.h ('k') | chrome/common/nacl_fork_delegate_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698