From 8a775fff06679683a4ac8adf49855db19fcf7d19 Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Sun, 1 Oct 2000 05:26:26 +0000 Subject: [PATCH] Removes need for chrome r/a=blizzard@redhat.com b=54428 git-svn-id: svn://10.0.0.236/trunk@80198 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/base/nsEmbedAPI.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mozilla/embedding/base/nsEmbedAPI.cpp b/mozilla/embedding/base/nsEmbedAPI.cpp index fdebee1051c..7ac4a85903b 100644 --- a/mozilla/embedding/base/nsEmbedAPI.cpp +++ b/mozilla/embedding/base/nsEmbedAPI.cpp @@ -164,15 +164,12 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory, rv = sServiceManager->GetService("@mozilla.org/chrome/chrome-registry;1", nsIChromeRegistry::GetIID(), getter_AddRefs(chromeReg)); - NS_ASSERTION(chromeReg, "chrome check couldn't get the chrome registry"); - - if (!chromeReg) - return NS_ERROR_FAILURE; - - // Ignore the return value here. If chrome is already initialized - // this call will return an error even though nothing is wrong. - chromeReg->CheckForNewChrome(); - + if (chromeReg) + { + // Ignore the return value here. If chrome is already initialized + // this call will return an error even though nothing is wrong. + (void) chromeReg->CheckForNewChrome(); + } return NS_OK; }