| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 // TODO(port): the ifdefs in here are a first step towards trying to determine | 5 // TODO(port): the ifdefs in here are a first step towards trying to determine |
| 6 // the correct abstraction for all the OS functionality required at this | 6 // the correct abstraction for all the OS functionality required at this |
| 7 // stage of process initialization. It should not be taken as a final | 7 // stage of process initialization. It should not be taken as a final |
| 8 // abstraction. | 8 // abstraction. |
| 9 | 9 |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 startup_timer.Stop(); // End of Startup Time Measurement. | 415 startup_timer.Stop(); // End of Startup Time Measurement. |
| 416 | 416 |
| 417 MainFunctionParams main_params(parsed_command_line, sandbox_wrapper, | 417 MainFunctionParams main_params(parsed_command_line, sandbox_wrapper, |
| 418 &autorelease_pool); | 418 &autorelease_pool); |
| 419 | 419 |
| 420 // TODO(port): turn on these main() functions as they've been de-winified. | 420 // TODO(port): turn on these main() functions as they've been de-winified. |
| 421 int rv = -1; | 421 int rv = -1; |
| 422 if (process_type == switches::kRendererProcess) { | 422 if (process_type == switches::kRendererProcess) { |
| 423 rv = RendererMain(main_params); | 423 rv = RendererMain(main_params); |
| 424 } else if (process_type == switches::kPluginProcess) { | 424 } else if (process_type == switches::kPluginProcess) { |
| 425 #if defined(OS_WIN) | 425 #if defined(OS_WIN) || defined(OS_LINUX) |
| 426 rv = PluginMain(main_params); | 426 rv = PluginMain(main_params); |
| 427 #else |
| 428 NOTIMPLEMENTED(); |
| 427 #endif | 429 #endif |
| 428 } else if (process_type == switches::kWorkerProcess) { | 430 } else if (process_type == switches::kWorkerProcess) { |
| 429 #if defined(OS_WIN) | 431 #if defined(OS_WIN) |
| 430 rv = WorkerMain(main_params); | 432 rv = WorkerMain(main_params); |
| 433 #else |
| 434 NOTIMPLEMENTED(); |
| 431 #endif | 435 #endif |
| 432 } else if (process_type.empty()) { | 436 } else if (process_type.empty()) { |
| 433 #if defined(OS_LINUX) | 437 #if defined(OS_LINUX) |
| 434 // Glib/GDK type system and threading initializations. Needed at | 438 // Glib/GDK type system and threading initializations. Needed at |
| 435 // least for gconf usage in net/proxy/proxy_config_service_linux.cc. | 439 // least for gconf usage in net/proxy/proxy_config_service_linux.cc. |
| 436 // TODO(sdoyon): confirm whether gconf truly needs this. If so, | 440 // TODO(sdoyon): confirm whether gconf truly needs this. If so, |
| 437 // the GTK main loop (message pump) must also be made to call | 441 // the GTK main loop (message pump) must also be made to call |
| 438 // gdk_threads_enter/leave(). Similar issue with the clipboard | 442 // gdk_threads_enter/leave(). Similar issue with the clipboard |
| 439 // (estade@ deanm@). | 443 // (estade@ deanm@). |
| 440 g_type_init(); | 444 g_type_init(); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 460 _CrtDumpMemoryLeaks(); | 464 _CrtDumpMemoryLeaks(); |
| 461 #endif // _CRTDBG_MAP_ALLOC | 465 #endif // _CRTDBG_MAP_ALLOC |
| 462 | 466 |
| 463 _Module.Term(); | 467 _Module.Term(); |
| 464 #endif | 468 #endif |
| 465 | 469 |
| 466 logging::CleanupChromeLogging(); | 470 logging::CleanupChromeLogging(); |
| 467 | 471 |
| 468 return rv; | 472 return rv; |
| 469 } | 473 } |
| OLD | NEW |