diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 22:50:25 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-02 22:50:25 +0000 |
| commit | 730fb13db106c6e9b29314b10221959bc4706650 (patch) | |
| tree | 40801770d2db9afe260134b3ad4a93edf0b7b804 /chrome | |
| parent | d1f2e93ff399c077d58e02c3799bb2bd817735fa (diff) | |
| download | chromium_src-730fb13db106c6e9b29314b10221959bc4706650.zip chromium_src-730fb13db106c6e9b29314b10221959bc4706650.tar.gz chromium_src-730fb13db106c6e9b29314b10221959bc4706650.tar.bz2 | |
linux: call PR_Init on UI thread
It complains about being shutdown on the wrong thread otherwise.
BUG=18410
Review URL: http://codereview.chromium.org/178062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 789f772..1512aef 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -55,6 +55,7 @@ #include "chrome/app/breakpad_mac.h" #endif #if defined(OS_LINUX) +#include "base/nss_init.h" #include "chrome/app/breakpad_linux.h" #endif #include "chrome/app/scoped_ole_initializer.h" @@ -583,6 +584,9 @@ int ChromeMain(int argc, const char** argv) { #endif } else if (process_type.empty()) { #if defined(OS_LINUX) + // We want to be sure to init NSPR on the main thread. + base::EnsureNSPRInit(); + g_thread_init(NULL); // Glib type system initialization. Needed at least for gconf, // used in net/proxy/proxy_config_service_linux.cc. Most likely |