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

Side by Side Diff: chrome/nacl/nacl_exe_win_64.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 | « chrome/nacl/DEPS ('k') | chrome/nacl/nacl_main_platform_delegate_win.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 "base/at_exit.h" 5 #include "base/at_exit.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/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/system_monitor/system_monitor.h" 12 #include "base/system_monitor/system_monitor.h"
13 #include "chrome/app/breakpad_win.h" 13 #include "chrome/app/breakpad_win.h"
14 #include "chrome/common/chrome_result_codes.h" 14 #include "chrome/common/chrome_result_codes.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/logging_chrome.h" 16 #include "chrome/common/logging_chrome.h"
17 #include "chrome/nacl/nacl_broker_listener.h" 17 #include "chrome/nacl/nacl_broker_listener.h"
18 #include "chrome/nacl/nacl_listener.h" 18 #include "chrome/nacl/nacl_listener.h"
19 #include "chrome/nacl/nacl_main_platform_delegate.h" 19 #include "chrome/nacl/nacl_main_platform_delegate.h"
20 #include "content/public/app/startup_helper_win.h" 20 #include "content/public/app/startup_helper_win.h"
21 #include "content/public/common/main_function_params.h" 21 #include "content/public/common/main_function_params.h"
22 #include "content/public/common/sandbox_init.h" 22 #include "content/public/common/sandbox_init.h"
23 #include "sandbox/src/sandbox_types.h" 23 #include "sandbox/win/src/sandbox_types.h"
24 24
25 extern int NaClMain(const content::MainFunctionParams&); 25 extern int NaClMain(const content::MainFunctionParams&);
26 26
27 // main() routine for the NaCl broker process. 27 // main() routine for the NaCl broker process.
28 // This is necessary for supporting NaCl in Chrome on Win64. 28 // This is necessary for supporting NaCl in Chrome on Win64.
29 int NaClBrokerMain(const content::MainFunctionParams& parameters) { 29 int NaClBrokerMain(const content::MainFunctionParams& parameters) {
30 const CommandLine& parsed_command_line = parameters.command_line; 30 const CommandLine& parsed_command_line = parameters.command_line;
31 31
32 MessageLoopForIO main_message_loop; 32 MessageLoopForIO main_message_loop;
33 base::PlatformThread::SetName("CrNaClBrokerMain"); 33 base::PlatformThread::SetName("CrNaClBrokerMain");
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 if (process_type == switches::kNaClLoaderProcess) 71 if (process_type == switches::kNaClLoaderProcess)
72 return NaClMain(main_params); 72 return NaClMain(main_params);
73 73
74 if (process_type == switches::kNaClBrokerProcess) 74 if (process_type == switches::kNaClBrokerProcess)
75 return NaClBrokerMain(main_params); 75 return NaClBrokerMain(main_params);
76 76
77 CHECK(false) << "Unknown NaCl 64 process."; 77 CHECK(false) << "Unknown NaCl 64 process.";
78 return -1; 78 return -1;
79 } 79 }
OLDNEW
« no previous file with comments | « chrome/nacl/DEPS ('k') | chrome/nacl/nacl_main_platform_delegate_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698