diff options
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index f30e39a..f752ade 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -96,7 +96,7 @@ extern int NaClMain(const MainFunctionParams&); extern int UtilityMain(const MainFunctionParams&); extern int ProfileImportMain(const MainFunctionParams&); extern int ZygoteMain(const MainFunctionParams&); -#ifdef NACL_WIN64 +#if defined(_WIN64) extern int NaClBrokerMain(const MainFunctionParams&); #endif @@ -264,7 +264,7 @@ static void AdjustLinuxOOMScore(const std::string& process_type) { } else if (process_type == switches::kProfileImportProcess) { NOTIMPLEMENTED(); #ifndef DISABLE_NACL - } else if (process_type == switches::kNaClProcess) { + } else if (process_type == switches::kNaClLoaderProcess) { score = kPluginScore; #endif } else if (process_type == switches::kZygoteProcess || @@ -689,9 +689,13 @@ int ChromeMain(int argc, char** argv) { } else if (process_type == switches::kWorkerProcess) { rv = WorkerMain(main_params); #ifndef DISABLE_NACL - } else if (process_type == switches::kNaClProcess) { + } else if (process_type == switches::kNaClLoaderProcess) { rv = NaClMain(main_params); #endif +#ifdef _WIN64 // The broker process is used only on Win64. + } else if (process_type == switches::kNaClBrokerProcess) { + rv = NaClBrokerMain(main_params); +#endif } else if (process_type == switches::kZygoteProcess) { #if defined(OS_POSIX) && !defined(OS_MACOSX) if (ZygoteMain(main_params)) { |