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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 &autorelease_pool); | 547 &autorelease_pool); |
548 rv = RendererMain(main_params); | 548 rv = RendererMain(main_params); |
549 } else { | 549 } else { |
550 rv = 0; | 550 rv = 0; |
551 } | 551 } |
552 #else | 552 #else |
553 NOTIMPLEMENTED(); | 553 NOTIMPLEMENTED(); |
554 #endif | 554 #endif |
555 } else if (process_type.empty()) { | 555 } else if (process_type.empty()) { |
556 #if defined(OS_LINUX) | 556 #if defined(OS_LINUX) |
| 557 g_thread_init(NULL); |
557 // Glib type system initialization. Needed at least for gconf, | 558 // Glib type system initialization. Needed at least for gconf, |
558 // used in net/proxy/proxy_config_service_linux.cc. Most likely | 559 // used in net/proxy/proxy_config_service_linux.cc. Most likely |
559 // this is superfluous as gtk_init() ought to do this. It's | 560 // this is superfluous as gtk_init() ought to do this. It's |
560 // definitely harmless, so retained as a reminder of this | 561 // definitely harmless, so retained as a reminder of this |
561 // requirement for gconf. | 562 // requirement for gconf. |
562 g_type_init(); | 563 g_type_init(); |
563 // gtk_init() can change |argc| and |argv|, but nobody else uses them. | 564 // gtk_init() can change |argc| and |argv|, but nobody else uses them. |
564 gtk_init(&argc, const_cast<char***>(&argv)); | 565 gtk_init(&argc, const_cast<char***>(&argv)); |
565 SetUpGLibLogHandler(); | 566 SetUpGLibLogHandler(); |
566 #endif | 567 #endif |
(...skipping 18 matching lines...) Expand all Loading... |
585 | 586 |
586 logging::CleanupChromeLogging(); | 587 logging::CleanupChromeLogging(); |
587 | 588 |
588 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) | 589 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) |
589 // TODO(mark): See the TODO(mark) above at InitCrashReporter. | 590 // TODO(mark): See the TODO(mark) above at InitCrashReporter. |
590 DestructCrashReporter(); | 591 DestructCrashReporter(); |
591 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD | 592 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD |
592 | 593 |
593 return rv; | 594 return rv; |
594 } | 595 } |
OLD | NEW |