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

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

Issue 8346017: Move content_browser_client.h to public, and while at it, move (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missed a file post merge. 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 | « content/browser/worker_host/worker_process_host.cc ('k') | content/common/view_messages.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 "content/browser/zygote_host_linux.h" 5 #include "content/browser/zygote_host_linux.h"
6 6
7 #include <sys/socket.h> 7 #include <sys/socket.h>
8 #include <sys/stat.h> 8 #include <sys/stat.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #include <unistd.h> 10 #include <unistd.h>
11 11
12 #include "base/base_switches.h" 12 #include "base/base_switches.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/eintr_wrapper.h" 14 #include "base/eintr_wrapper.h"
15 #include "base/environment.h" 15 #include "base/environment.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/linux_util.h" 17 #include "base/linux_util.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
20 #include "base/path_service.h" 20 #include "base/path_service.h"
21 #include "base/pickle.h" 21 #include "base/pickle.h"
22 #include "base/process_util.h" 22 #include "base/process_util.h"
23 #include "base/string_number_conversions.h" 23 #include "base/string_number_conversions.h"
24 #include "base/string_util.h" 24 #include "base/string_util.h"
25 #include "base/time.h" 25 #include "base/time.h"
26 #include "base/utf_string_conversions.h" 26 #include "base/utf_string_conversions.h"
27 #include "content/browser/content_browser_client.h"
28 #include "content/browser/renderer_host/render_sandbox_host_linux.h" 27 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
29 #include "content/common/process_watcher.h" 28 #include "content/common/process_watcher.h"
30 #include "content/common/result_codes.h" 29 #include "content/common/result_codes.h"
31 #include "content/common/unix_domain_socket_posix.h" 30 #include "content/common/unix_domain_socket_posix.h"
31 #include "content/public/browser/content_browser_client.h"
32 #include "content/public/common/content_switches.h" 32 #include "content/public/common/content_switches.h"
33 #include "sandbox/linux/suid/suid_unsafe_environment_variables.h" 33 #include "sandbox/linux/suid/suid_unsafe_environment_variables.h"
34 34
35 #if defined(USE_TCMALLOC) 35 #if defined(USE_TCMALLOC)
36 #include "third_party/tcmalloc/chromium/src/google/heap-profiler.h" 36 #include "third_party/tcmalloc/chromium/src/google/heap-profiler.h"
37 #endif 37 #endif
38 38
39 static void SaveSUIDUnsafeEnvironmentVariables() { 39 static void SaveSUIDUnsafeEnvironmentVariables() {
40 // The ELF loader will clear many environment variables so we save them to 40 // The ELF loader will clear many environment variables so we save them to
41 // different names here so that the SUID sandbox can resolve them for the 41 // different names here so that the SUID sandbox can resolve them for the
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 !read_pickle.ReadInt(&iter, &tmp_exit_code)) { 400 !read_pickle.ReadInt(&iter, &tmp_exit_code)) {
401 LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote."; 401 LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote.";
402 return base::TERMINATION_STATUS_NORMAL_TERMINATION; 402 return base::TERMINATION_STATUS_NORMAL_TERMINATION;
403 } 403 }
404 404
405 if (exit_code) 405 if (exit_code)
406 *exit_code = tmp_exit_code; 406 *exit_code = tmp_exit_code;
407 407
408 return static_cast<base::TerminationStatus>(status); 408 return static_cast<base::TerminationStatus>(status);
409 } 409 }
OLDNEW
« no previous file with comments | « content/browser/worker_host/worker_process_host.cc ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698