diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 01:14:36 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 01:14:36 +0000 |
| commit | ce4f3bda0b09ed2cfd4773d493aeb432428a4cfc (patch) | |
| tree | 01bce3d6d6590b967146b011c50b5763defc7ae6 /chrome | |
| parent | d07f31723cd037a8c6bef60b234fdb4ad746f34a (diff) | |
| download | chromium_src-ce4f3bda0b09ed2cfd4773d493aeb432428a4cfc.zip chromium_src-ce4f3bda0b09ed2cfd4773d493aeb432428a4cfc.tar.gz chromium_src-ce4f3bda0b09ed2cfd4773d493aeb432428a4cfc.tar.bz2 | |
Revert "linux: call g_thread_init() at relevant startup points"
This reverts commit r24203, Mac breakage.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 1 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 2 | ||||
| -rw-r--r-- | chrome/plugin/plugin_thread.cc | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 792d0ad..1783117 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -554,7 +554,6 @@ int ChromeMain(int argc, const char** argv) { #endif } else if (process_type.empty()) { #if defined(OS_LINUX) - g_thread_init(NULL); // Glib type system initialization. Needed at least for gconf, // used in net/proxy/proxy_config_service_linux.cc. Most likely // this is superfluous as gtk_init() ought to do this. It's diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index c368821..2ed58c8 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3046,6 +3046,8 @@ '<@(chromium_dependencies)', # Needed for chrome_dll_main.cc #include of gtk/gtk.h '../build/linux/system.gyp:gtk', + # Needed for chrome_dll_main.cc use of g_thread_init + '../build/linux/system.gyp:gthread', ], 'sources': [ 'app/chrome_dll_main.cc', diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index 307cbaa..ae90e1a 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -35,7 +35,6 @@ PluginThread::PluginThread() { // XEmbed plugins assume they are hosted in a Gtk application, so we need // to initialize Gtk in the plugin process. - g_thread_init(NULL); const std::vector<std::string>& args = CommandLine::ForCurrentProcess()->argv(); int argc = args.size(); |