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

Side by Side Diff: content/zygote/zygote_main_linux.cc

Issue 11734021: Roll ICU and convert include style to standard Chromium style, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/renderer/renderer_main_platform_delegate_win.cc ('k') | net/base/net_util.cc » ('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) 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 <dlfcn.h> 5 #include <dlfcn.h>
6 #include <fcntl.h> 6 #include <fcntl.h>
7 #include <pthread.h> 7 #include <pthread.h>
8 #include <stdio.h> 8 #include <stdio.h>
9 #include <sys/socket.h> 9 #include <sys/socket.h>
10 #include <sys/stat.h> 10 #include <sys/stat.h>
(...skipping 20 matching lines...) Expand all
31 #include "content/common/sandbox_linux.h" 31 #include "content/common/sandbox_linux.h"
32 #include "content/common/zygote_commands_linux.h" 32 #include "content/common/zygote_commands_linux.h"
33 #include "content/public/common/content_switches.h" 33 #include "content/public/common/content_switches.h"
34 #include "content/public/common/main_function_params.h" 34 #include "content/public/common/main_function_params.h"
35 #include "content/public/common/sandbox_linux.h" 35 #include "content/public/common/sandbox_linux.h"
36 #include "content/public/common/zygote_fork_delegate_linux.h" 36 #include "content/public/common/zygote_fork_delegate_linux.h"
37 #include "content/zygote/zygote_linux.h" 37 #include "content/zygote/zygote_linux.h"
38 #include "sandbox/linux/services/libc_urandom_override.h" 38 #include "sandbox/linux/services/libc_urandom_override.h"
39 #include "sandbox/linux/suid/client/setuid_sandbox_client.h" 39 #include "sandbox/linux/suid/client/setuid_sandbox_client.h"
40 #include "skia/ext/SkFontHost_fontconfig_control.h" 40 #include "skia/ext/SkFontHost_fontconfig_control.h"
41 #include "unicode/timezone.h" 41 #include "third_party/icu/public/i18n/unicode/timezone.h"
42 42
43 #if defined(OS_LINUX) 43 #if defined(OS_LINUX)
44 #include <sys/epoll.h> 44 #include <sys/epoll.h>
45 #include <sys/prctl.h> 45 #include <sys/prctl.h>
46 #include <sys/signal.h> 46 #include <sys/signal.h>
47 #else 47 #else
48 #include <signal.h> 48 #include <signal.h>
49 #endif 49 #endif
50 50
51 namespace content { 51 namespace content {
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 } 489 }
490 490
491 int sandbox_flags = linux_sandbox->GetStatus(); 491 int sandbox_flags = linux_sandbox->GetStatus();
492 492
493 Zygote zygote(sandbox_flags, forkdelegate); 493 Zygote zygote(sandbox_flags, forkdelegate);
494 // This function call can return multiple times, once per fork(). 494 // This function call can return multiple times, once per fork().
495 return zygote.ProcessRequests(); 495 return zygote.ProcessRequests();
496 } 496 }
497 497
498 } // namespace content 498 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_main_platform_delegate_win.cc ('k') | net/base/net_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698