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

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

Issue 18252003: Replace third_party/icu/public with third_party/icu/source (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: roll ICU to 211851 Created 7 years, 5 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') | ios/public/DEPS » ('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 "content/zygote/zygote_main.h" 5 #include "content/zygote/zygote_main.h"
6 6
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <pthread.h> 9 #include <pthread.h>
10 #include <stdio.h> 10 #include <stdio.h>
(...skipping 21 matching lines...) Expand all
32 #include "content/common/sandbox_linux.h" 32 #include "content/common/sandbox_linux.h"
33 #include "content/common/zygote_commands_linux.h" 33 #include "content/common/zygote_commands_linux.h"
34 #include "content/public/common/content_switches.h" 34 #include "content/public/common/content_switches.h"
35 #include "content/public/common/main_function_params.h" 35 #include "content/public/common/main_function_params.h"
36 #include "content/public/common/sandbox_linux.h" 36 #include "content/public/common/sandbox_linux.h"
37 #include "content/public/common/zygote_fork_delegate_linux.h" 37 #include "content/public/common/zygote_fork_delegate_linux.h"
38 #include "content/zygote/zygote_linux.h" 38 #include "content/zygote/zygote_linux.h"
39 #include "crypto/nss_util.h" 39 #include "crypto/nss_util.h"
40 #include "sandbox/linux/services/libc_urandom_override.h" 40 #include "sandbox/linux/services/libc_urandom_override.h"
41 #include "sandbox/linux/suid/client/setuid_sandbox_client.h" 41 #include "sandbox/linux/suid/client/setuid_sandbox_client.h"
42 #include "third_party/icu/public/i18n/unicode/timezone.h" 42 #include "third_party/icu/source/i18n/unicode/timezone.h"
43 #include "third_party/skia/include/ports/SkFontConfigInterface.h" 43 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
44 44
45 #if defined(OS_LINUX) 45 #if defined(OS_LINUX)
46 #include <sys/epoll.h> 46 #include <sys/epoll.h>
47 #include <sys/prctl.h> 47 #include <sys/prctl.h>
48 #include <sys/signal.h> 48 #include <sys/signal.h>
49 #else 49 #else
50 #include <signal.h> 50 #include <signal.h>
51 #endif 51 #endif
52 52
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 } 468 }
469 469
470 int sandbox_flags = linux_sandbox->GetStatus(); 470 int sandbox_flags = linux_sandbox->GetStatus();
471 471
472 Zygote zygote(sandbox_flags, forkdelegate); 472 Zygote zygote(sandbox_flags, forkdelegate);
473 // This function call can return multiple times, once per fork(). 473 // This function call can return multiple times, once per fork().
474 return zygote.ProcessRequests(); 474 return zygote.ProcessRequests();
475 } 475 }
476 476
477 } // namespace content 477 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_main_platform_delegate_win.cc ('k') | ios/public/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698