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

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 178062: linux: call PR_Init on UI thread (Closed)
Patch Set: copyrights 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 side-by-side diff with in-line comments
Download patch
« base/singleton.h ('K') | « base/singleton.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_dll_main.cc
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 5f7e37f28717c61f20dd746838528c2cdfaa837e..985f4c7ac4beb52926bc4b4f688aee906e021090 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.
wtc 2009/09/02 01:17:17 Should be 2006-2009.
// 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"
@@ -547,6 +548,11 @@ int ChromeMain(int argc, const char** argv) {
}
#endif // NDEBUG
+#if defined(OS_LINUX)
+ // We want to be sure to init NSPR on the main thread.
+ base::EnsureNSPRInit();
wtc 2009/09/02 01:17:17 Are we using NSS/NSPR in the renderer processes, t
+#endif
+
if (!process_type.empty())
CommonSubprocessInit();
« base/singleton.h ('K') | « base/singleton.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698