forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split chrome/nacl/nacl_exe_win_64.cc
Move most of the content to the components/nacl folder and make sure it doesn't include anything from chrome. Setting the breakpad client is kept in chrome.
This is part of an effort to componentize NaCl code.
BUG=244791
Review URL: https://codereview.chromium.org/59263006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235013 0039d316-1c4b-4281-b951-d872f2087c98- Loading branch information
alexis.menard@intel.com
committed
Nov 14, 2013
1 parent
f40dcd1
commit 6b492fd
Showing
4 changed files
with
101 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| // Copyright 2013 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "base/command_line.h" | ||
| #include "base/logging.h" | ||
| #include "base/message_loop/message_loop.h" | ||
| #include "base/power_monitor/power_monitor.h" | ||
| #include "base/power_monitor/power_monitor_device_source.h" | ||
| #include "base/process/launch.h" | ||
| #include "base/process/memory.h" | ||
| #include "base/strings/string_util.h" | ||
| #include "base/timer/hi_res_timer_manager.h" | ||
| #include "components/nacl/broker/nacl_broker_listener.h" | ||
| #include "components/nacl/common/nacl_switches.h" | ||
| #include "components/nacl/loader/nacl_listener.h" | ||
| #include "components/nacl/loader/nacl_main_platform_delegate.h" | ||
| #include "content/public/app/startup_helper_win.h" | ||
| #include "content/public/common/content_switches.h" | ||
| #include "content/public/common/main_function_params.h" | ||
| #include "content/public/common/sandbox_init.h" | ||
| #include "sandbox/win/src/sandbox_types.h" | ||
|
|
||
| extern int NaClMain(const content::MainFunctionParams&); | ||
|
|
||
| namespace { | ||
| // main() routine for the NaCl broker process. | ||
| // This is necessary for supporting NaCl in Chrome on Win64. | ||
| int NaClBrokerMain(const content::MainFunctionParams& parameters) { | ||
| base::MessageLoopForIO main_message_loop; | ||
| base::PlatformThread::SetName("CrNaClBrokerMain"); | ||
|
|
||
| scoped_ptr<base::PowerMonitorSource> power_monitor_source( | ||
| new base::PowerMonitorDeviceSource()); | ||
| base::PowerMonitor power_monitor(power_monitor_source.Pass()); | ||
| base::HighResolutionTimerManager hi_res_timer_manager; | ||
|
|
||
| NaClBrokerListener listener; | ||
| listener.Listen(); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| namespace nacl { | ||
|
|
||
| int NaClWin64Main() { | ||
| sandbox::SandboxInterfaceInfo sandbox_info = {0}; | ||
| content::InitializeSandboxInfo(&sandbox_info); | ||
|
|
||
| const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | ||
| std::string process_type = | ||
| command_line.GetSwitchValueASCII(switches::kProcessType); | ||
|
|
||
| // Copy what ContentMain() does. | ||
| base::EnableTerminationOnHeapCorruption(); | ||
| base::EnableTerminationOnOutOfMemory(); | ||
| content::RegisterInvalidParamHandler(); | ||
| content::SetupCRT(command_line); | ||
| // Route stdio to parent console (if any) or create one. | ||
| if (command_line.HasSwitch(switches::kEnableLogging)) | ||
| base::RouteStdioToConsole(); | ||
|
|
||
| // Initialize the sandbox for this process. | ||
| bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info); | ||
| // Die if the sandbox can't be enabled. | ||
| CHECK(sandbox_initialized_ok) << "Error initializing sandbox for " | ||
| << process_type; | ||
| content::MainFunctionParams main_params(command_line); | ||
| main_params.sandbox_info = &sandbox_info; | ||
|
|
||
| if (process_type == switches::kNaClLoaderProcess) | ||
| return NaClMain(main_params); | ||
|
|
||
| if (process_type == switches::kNaClBrokerProcess) | ||
| return NaClBrokerMain(main_params); | ||
|
|
||
| CHECK(false) << "Unknown NaCl 64 process."; | ||
| return -1; | ||
| } | ||
|
|
||
| } // namespace nacl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // Copyright 2013 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #ifndef COMPONENTS_NACL_LOADER_NACL_HELPER_WIN_64_H_ | ||
| #define COMPONENTS_NACL_LOADER_NACL_HELPER_WIN_64_H_ | ||
|
|
||
| namespace nacl { | ||
|
|
||
| int NaClWin64Main(); | ||
|
|
||
| } // namespace nacl | ||
|
|
||
| #endif // COMPONENTS_NACL_LOADER_NACL_HELPER_WIN_64_H_ |