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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 3855004: Make USE_OPENSSL and USE_NSS mutually exclusive (Closed)
Patch Set: wtc comments Created 10 years, 2 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
« no previous file with comments | « build/build_config.h ('k') | chrome/browser/dom_ui/options/advanced_options_handler.cc » ('j') | 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 ca73937f07f520387545cc5ccbc3209b8d7c42f7..18ee2fd52b41862b926f993f2aaee79afe3df526 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -926,8 +926,10 @@ int ChromeMain(int argc, char** argv) {
ZygoteHost* zhost = Singleton<ZygoteHost>::get();
zhost->Init(sandbox_cmd);
+#if defined(USE_NSS)
// We want to be sure to init NSPR on the main thread.
base::EnsureNSPRInit();
+#endif
g_thread_init(NULL);
// Glib type system initialization. Needed at least for gconf,
« no previous file with comments | « build/build_config.h ('k') | chrome/browser/dom_ui/options/advanced_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698