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

Side by Side Diff: content/utility/utility_main.cc

Issue 13814027: Linux: make current InitializeSandbox() private. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove sandbox_init_linux.cc Created 7 years, 8 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) 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/hi_res_timer_manager.h" 6 #include "base/hi_res_timer_manager.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/power_monitor/power_monitor.h" 8 #include "base/power_monitor/power_monitor.h"
9 #include "base/threading/platform_thread.h" 9 #include "base/threading/platform_thread.h"
10 #include "content/common/child_process.h" 10 #include "content/common/child_process.h"
11 #include "content/common/sandbox_linux.h"
11 #include "content/public/common/content_switches.h" 12 #include "content/public/common/content_switches.h"
12 #include "content/public/common/main_function_params.h" 13 #include "content/public/common/main_function_params.h"
13 #include "content/public/common/sandbox_init.h" 14 #include "content/public/common/sandbox_init.h"
14 #include "content/utility/utility_thread_impl.h" 15 #include "content/utility/utility_thread_impl.h"
15 16
16 #if defined(OS_WIN) 17 #if defined(OS_WIN)
17 #include "sandbox/win/src/sandbox.h" 18 #include "sandbox/win/src/sandbox.h"
18 #endif 19 #endif
19 20
20 namespace content { 21 namespace content {
21 22
22 // Mainline routine for running as the utility process. 23 // Mainline routine for running as the utility process.
23 int UtilityMain(const MainFunctionParams& parameters) { 24 int UtilityMain(const MainFunctionParams& parameters) {
24 // The main message loop of the utility process. 25 // The main message loop of the utility process.
25 MessageLoop main_message_loop; 26 MessageLoop main_message_loop;
26 base::PlatformThread::SetName("CrUtilityMain"); 27 base::PlatformThread::SetName("CrUtilityMain");
27 28
28 base::PowerMonitor power_monitor; 29 base::PowerMonitor power_monitor;
29 HighResolutionTimerManager hi_res_timer_manager; 30 HighResolutionTimerManager hi_res_timer_manager;
30 31
31 #if defined(OS_LINUX) 32 #if defined(OS_LINUX)
32 // Initialize the sandbox before any thread is created. 33 // Initialize the sandbox before any thread is created.
33 InitializeSandbox(); 34 LinuxSandbox::InitializeSandbox();
34 #endif 35 #endif
35 36
36 ChildProcess utility_process; 37 ChildProcess utility_process;
37 utility_process.set_main_thread(new UtilityThreadImpl()); 38 utility_process.set_main_thread(new UtilityThreadImpl());
38 39
39 #if defined(OS_WIN) 40 #if defined(OS_WIN)
40 bool no_sandbox = parameters.command_line.HasSwitch(switches::kNoSandbox); 41 bool no_sandbox = parameters.command_line.HasSwitch(switches::kNoSandbox);
41 if (!no_sandbox) { 42 if (!no_sandbox) {
42 sandbox::TargetServices* target_services = 43 sandbox::TargetServices* target_services =
43 parameters.sandbox_info->target_services; 44 parameters.sandbox_info->target_services;
44 if (!target_services) 45 if (!target_services)
45 return false; 46 return false;
46 target_services->LowerToken(); 47 target_services->LowerToken();
47 } 48 }
48 #endif 49 #endif
49 50
50 MessageLoop::current()->Run(); 51 MessageLoop::current()->Run();
51 52
52 return 0; 53 return 0;
53 } 54 }
54 55
55 } // namespace content 56 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_main_platform_delegate_linux.cc ('k') | content/worker/worker_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698