Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: chrome/app/chrome_dll_main.cc

Issue 173309: Revert "linux: call g_thread_init() at relevant startup points" (Closed)
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/linux/system.gyp ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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);
558 // Glib type system initialization. Needed at least for gconf, 557 // Glib type system initialization. Needed at least for gconf,
559 // used in net/proxy/proxy_config_service_linux.cc. Most likely 558 // used in net/proxy/proxy_config_service_linux.cc. Most likely
560 // this is superfluous as gtk_init() ought to do this. It's 559 // this is superfluous as gtk_init() ought to do this. It's
561 // definitely harmless, so retained as a reminder of this 560 // definitely harmless, so retained as a reminder of this
562 // requirement for gconf. 561 // requirement for gconf.
563 g_type_init(); 562 g_type_init();
564 // gtk_init() can change |argc| and |argv|, but nobody else uses them. 563 // gtk_init() can change |argc| and |argv|, but nobody else uses them.
565 gtk_init(&argc, const_cast<char***>(&argv)); 564 gtk_init(&argc, const_cast<char***>(&argv));
566 SetUpGLibLogHandler(); 565 SetUpGLibLogHandler();
567 #endif 566 #endif
(...skipping 18 matching lines...) Expand all
586 585
587 logging::CleanupChromeLogging(); 586 logging::CleanupChromeLogging();
588 587
589 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) 588 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
590 // TODO(mark): See the TODO(mark) above at InitCrashReporter. 589 // TODO(mark): See the TODO(mark) above at InitCrashReporter.
591 DestructCrashReporter(); 590 DestructCrashReporter();
592 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD 591 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD
593 592
594 return rv; 593 return rv;
595 } 594 }
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698