no longer a pref, it is hard coded to be on and set to modern.

remove temporary code.
This commit is contained in:
sspitzer%netscape.com 2000-05-11 05:19:21 +00:00
parent c20c51d9a9
commit fab9214a26
3 changed files with 4 additions and 21 deletions

View File

@ -70,7 +70,6 @@
#include "nsIIOService.h"
#include "nsIResProtocolHandler.h"
#include "nsLayoutCID.h"
#include "nsIPref.h"
static char kChromePrefix[] = "chrome://";
@ -79,7 +78,6 @@ 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;
@ -412,14 +410,8 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURL)
nsCAutoString finalURL;
GetBaseURL(package, provider, finalURL);
if (finalURL.IsEmpty()) {
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) {
/* hard coded, for now. */
if (provider.Equals("skin")) {
finalURL = "resource:/chrome/skins/modern/";
}
else {

View File

@ -564,4 +564,3 @@ pref("sidebar.customize.all_panels.url", "http://sidebar-rdf.netscape.com/%LOCAL
pref("prefs.converted-to-utf8",false);
pref("browser.throbber.url","http://www.mozilla.org");
pref("skins.enable.switching",true);

View File

@ -70,7 +70,6 @@
#include "nsIIOService.h"
#include "nsIResProtocolHandler.h"
#include "nsLayoutCID.h"
#include "nsIPref.h"
static char kChromePrefix[] = "chrome://";
@ -79,7 +78,6 @@ 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;
@ -412,14 +410,8 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURL)
nsCAutoString finalURL;
GetBaseURL(package, provider, finalURL);
if (finalURL.IsEmpty()) {
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) {
/* hard coded, for now. */
if (provider.Equals("skin")) {
finalURL = "resource:/chrome/skins/modern/";
}
else {