| OLD | NEW |
| 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/power_monitor/power_monitor.h" | 10 #include "base/power_monitor/power_monitor.h" |
| 11 #include "base/process_util.h" | 11 #include "base/process_util.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.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" | |
| 16 #include "chrome/common/logging_chrome.h" | 15 #include "chrome/common/logging_chrome.h" |
| 17 #include "chrome/nacl/nacl_broker_listener.h" | 16 #include "chrome/nacl/nacl_broker_listener.h" |
| 18 #include "chrome/nacl/nacl_listener.h" | 17 #include "chrome/nacl/nacl_listener.h" |
| 19 #include "chrome/nacl/nacl_main_platform_delegate.h" | 18 #include "chrome/nacl/nacl_main_platform_delegate.h" |
| 19 #include "components/nacl/common/nacl_switches.h" |
| 20 #include "content/public/app/startup_helper_win.h" | 20 #include "content/public/app/startup_helper_win.h" |
| 21 #include "content/public/common/content_switches.h" |
| 21 #include "content/public/common/main_function_params.h" | 22 #include "content/public/common/main_function_params.h" |
| 22 #include "content/public/common/sandbox_init.h" | 23 #include "content/public/common/sandbox_init.h" |
| 23 #include "sandbox/win/src/sandbox_types.h" | 24 #include "sandbox/win/src/sandbox_types.h" |
| 24 | 25 |
| 25 extern int NaClMain(const content::MainFunctionParams&); | 26 extern int NaClMain(const content::MainFunctionParams&); |
| 26 | 27 |
| 27 // main() routine for the NaCl broker process. | 28 // main() routine for the NaCl broker process. |
| 28 // This is necessary for supporting NaCl in Chrome on Win64. | 29 // This is necessary for supporting NaCl in Chrome on Win64. |
| 29 int NaClBrokerMain(const content::MainFunctionParams& parameters) { | 30 int NaClBrokerMain(const content::MainFunctionParams& parameters) { |
| 30 const CommandLine& parsed_command_line = parameters.command_line; | 31 const CommandLine& parsed_command_line = parameters.command_line; |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 | 74 |
| 74 if (process_type == switches::kNaClLoaderProcess) | 75 if (process_type == switches::kNaClLoaderProcess) |
| 75 return NaClMain(main_params); | 76 return NaClMain(main_params); |
| 76 | 77 |
| 77 if (process_type == switches::kNaClBrokerProcess) | 78 if (process_type == switches::kNaClBrokerProcess) |
| 78 return NaClBrokerMain(main_params); | 79 return NaClBrokerMain(main_params); |
| 79 | 80 |
| 80 CHECK(false) << "Unknown NaCl 64 process."; | 81 CHECK(false) << "Unknown NaCl 64 process."; |
| 81 return -1; | 82 return -1; |
| 82 } | 83 } |
| OLD | NEW |