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

Side by Side Diff: content/worker/worker_main.cc

Issue 10689170: Move the Windows sandbox to sandbox/win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on top of tree (properly this time) Created 8 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/worker/DEPS ('k') | sandbox/sandbox.gyp » ('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 "base/base_switches.h" 5 #include "base/base_switches.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/hi_res_timer_manager.h" 7 #include "base/hi_res_timer_manager.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/system_monitor/system_monitor.h" 10 #include "base/system_monitor/system_monitor.h"
11 #include "base/threading/platform_thread.h" 11 #include "base/threading/platform_thread.h"
12 #include "content/common/child_process.h" 12 #include "content/common/child_process.h"
13 #include "content/public/common/main_function_params.h" 13 #include "content/public/common/main_function_params.h"
14 #include "content/public/common/sandbox_init.h" 14 #include "content/public/common/sandbox_init.h"
15 #include "content/worker/worker_thread.h" 15 #include "content/worker/worker_thread.h"
16 16
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 #include "sandbox/src/sandbox.h" 18 #include "sandbox/win/src/sandbox.h"
19 #endif 19 #endif
20 20
21 // Mainline routine for running as the worker process. 21 // Mainline routine for running as the worker process.
22 int WorkerMain(const content::MainFunctionParams& parameters) { 22 int WorkerMain(const content::MainFunctionParams& parameters) {
23 // The main message loop of the worker process. 23 // The main message loop of the worker process.
24 MessageLoop main_message_loop; 24 MessageLoop main_message_loop;
25 base::PlatformThread::SetName("CrWorkerMain"); 25 base::PlatformThread::SetName("CrWorkerMain");
26 26
27 base::SystemMonitor system_monitor; 27 base::SystemMonitor system_monitor;
28 HighResolutionTimerManager hi_res_timer_manager; 28 HighResolutionTimerManager hi_res_timer_manager;
(...skipping 24 matching lines...) Expand all
53 if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) { 53 if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) {
54 ChildProcess::WaitForDebugger("Worker"); 54 ChildProcess::WaitForDebugger("Worker");
55 } 55 }
56 56
57 // Load the accelerator table from the browser executable and tell the 57 // Load the accelerator table from the browser executable and tell the
58 // message loop to use it when translating messages. 58 // message loop to use it when translating messages.
59 MessageLoop::current()->Run(); 59 MessageLoop::current()->Run();
60 60
61 return 0; 61 return 0;
62 } 62 }
OLDNEW
« no previous file with comments | « content/worker/DEPS ('k') | sandbox/sandbox.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698