From fab9214a2622560cfb203357999ca49fe53d891b Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com" <sspitzer%netscape.com>
Date: Thu, 11 May 2000 05:19:21 +0000
Subject: [PATCH] no longer a pref, it is hard coded to be on and set to
 modern. remove temporary code.

---
 chrome/src/nsChromeRegistry.cpp     | 12 ++----------
 modules/libpref/src/init/all.js     |  1 -
 rdf/chrome/src/nsChromeRegistry.cpp | 12 ++----------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp
index c5ba330a49c3..ee58e9bbd2a3 100644
--- a/chrome/src/nsChromeRegistry.cpp
+++ b/chrome/src/nsChromeRegistry.cpp
@@ -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 {
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 1d6b293f0287..7e2b23eec4b1 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -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);
diff --git a/rdf/chrome/src/nsChromeRegistry.cpp b/rdf/chrome/src/nsChromeRegistry.cpp
index c5ba330a49c3..ee58e9bbd2a3 100644
--- a/rdf/chrome/src/nsChromeRegistry.cpp
+++ b/rdf/chrome/src/nsChromeRegistry.cpp
@@ -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 {