Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make the skin switching code turned on/off by a pref. off by default for now.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@68922 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com 2000-05-09 23:28:57 +00:00
parent e3323b8c26
commit 34854d1272
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/chrome/src/nsChromeRegistry.cpp
View File

@ -70,6 +70,7 @@
#include "nsIIOService.h"
#include "nsIResProtocolHandler.h"
#include "nsLayoutCID.h"
#include "nsIPref.h"
static char kChromePrefix[] = "chrome://";
@ -78,6 +79,7 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID);
static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID);
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
class nsChromeRegistry;
@ -410,17 +412,19 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURL)
nsCAutoString finalURL;
GetBaseURL(package, provider, finalURL);
if (finalURL.IsEmpty()) {
/* to test the themes / skin switching stuff I'm doing */
#if defined(DEBUG_sspitzer) || defined(DEBUG_seth)
if (provider.Equals("skin")) {
nsCOMPtr <nsIPref> prefService = do_GetService(kPrefServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
PRBool enableSwitching = PR_FALSE;
rv = prefService->GetBoolPref("skins.enable.switching",&enableSwitching);
if (NS_FAILED(rv)) return rv;
if (provider.Equals("skin") && enableSwitching) {
finalURL = "resource:/chrome/modern/";
}
else {
finalURL = "resource:/chrome/";
}
#else
finalURL = "resource:/chrome/";
#endif
}
finalURL += package;

16
mozilla/rdf/chrome/src/nsChromeRegistry.cpp
View File

@ -70,6 +70,7 @@
#include "nsIIOService.h"
#include "nsIResProtocolHandler.h"
#include "nsLayoutCID.h"
#include "nsIPref.h"
static char kChromePrefix[] = "chrome://";
@ -78,6 +79,7 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID);
static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID);
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
class nsChromeRegistry;
@ -410,17 +412,19 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURL)
nsCAutoString finalURL;
GetBaseURL(package, provider, finalURL);
if (finalURL.IsEmpty()) {
/* to test the themes / skin switching stuff I'm doing */
#if defined(DEBUG_sspitzer) || defined(DEBUG_seth)
if (provider.Equals("skin")) {
nsCOMPtr <nsIPref> prefService = do_GetService(kPrefServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
PRBool enableSwitching = PR_FALSE;
rv = prefService->GetBoolPref("skins.enable.switching",&enableSwitching);
if (NS_FAILED(rv)) return rv;
if (provider.Equals("skin") && enableSwitching) {
finalURL = "resource:/chrome/modern/";
}
else {
finalURL = "resource:/chrome/";
}
#else
finalURL = "resource:/chrome/";
#endif
}
finalURL += package;