Index: components/nacl/broker/nacl_exe_win_64.cc |
diff --git a/chrome/nacl/nacl_exe_win_64.cc b/components/nacl/broker/nacl_exe_win_64.cc |
similarity index 84% |
rename from chrome/nacl/nacl_exe_win_64.cc |
rename to components/nacl/broker/nacl_exe_win_64.cc |
index 7ba3c404b6cdb9d605a63aac7e6ba1eb494a23e6..f4a43000c0c6530b1a1b50732781d637f399b256 100644 |
--- a/chrome/nacl/nacl_exe_win_64.cc |
+++ b/components/nacl/broker/nacl_exe_win_64.cc |
@@ -10,19 +10,19 @@ |
#include "base/power_monitor/power_monitor.h" |
#include "base/process_util.h" |
#include "base/strings/string_util.h" |
-#include "chrome/app/breakpad_win.h" |
-#include "chrome/common/chrome_result_codes.h" |
-#include "chrome/common/chrome_switches.h" |
-#include "chrome/common/logging_chrome.h" |
-#include "chrome/nacl/nacl_broker_listener.h" |
-#include "chrome/nacl/nacl_listener.h" |
-#include "chrome/nacl/nacl_main_platform_delegate.h" |
+#include "components/nacl/broker/nacl_broker_listener.h" |
+#include "components/nacl/common/nacl_delegate.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&); |
+extern void InitCrashReporter(); |
jam
2013/06/17 20:10:43
again, you can not forward declare code from chrom
yael.aharon1
2013/06/18 17:16:30
jochen is in the process of moving this code to co
jam
2013/06/19 17:55:53
you should wait for that to happen first then. it'
yael.aharon1
2013/06/19 20:38:52
Since I could not find an immediate solution, I mo
|
// main() routine for the NaCl broker process. |
// This is necessary for supporting NaCl in Chrome on Win64. |
@@ -51,8 +51,8 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
InitCrashReporter(); |
const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
- std::string process_type = |
- command_line.GetSwitchValueASCII(switches::kProcessType); |
+ std::string process_type = command_line.GetSwitchValueASCII( |
+ switches::kProcessType); |
// Copy what ContentMain() does. |
base::EnableTerminationOnHeapCorruption(); |