133666 - skin switch on restart not completely performed. r=ben sr=hyatt

chrome/src/nsChromeRegistry.cpp

@@ -2925,10 +2925,6 @@ nsresult nsChromeRegistry::LoadProfileDataSource()
     rv = AddToCompositeDataSource(PR_TRUE);
     if (NS_FAILED(rv)) return rv;
 
-    // We have to flush the chrome cache!
-    rv = FlushCaches();
-    if (NS_FAILED(rv)) return rv;
-
     // XXX this sucks ASS. This is a temporary hack until we get
     // around to fixing the skin switching bugs.
     // Select and Remove skins based on a pref set in a previous session.
@@ -2943,6 +2939,10 @@ nsresult nsChromeRegistry::LoadProfileDataSource()
       }
     }
 
+    // We have to flush the chrome cache!
+    rv = FlushCaches();
+    if (NS_FAILED(rv)) return rv;
+
     rv = LoadStyleSheet(getter_AddRefs(mScrollbarSheet), NS_LITERAL_CSTRING("chrome://global/skin/scrollbars.css"));
     // This must always be the last line of profile initialization!
 

rdf/chrome/src/nsChromeRegistry.cpp

@@ -2925,10 +2925,6 @@ nsresult nsChromeRegistry::LoadProfileDataSource()
     rv = AddToCompositeDataSource(PR_TRUE);
     if (NS_FAILED(rv)) return rv;
 
-    // We have to flush the chrome cache!
-    rv = FlushCaches();
-    if (NS_FAILED(rv)) return rv;
-
     // XXX this sucks ASS. This is a temporary hack until we get
     // around to fixing the skin switching bugs.
     // Select and Remove skins based on a pref set in a previous session.
@@ -2943,6 +2939,10 @@ nsresult nsChromeRegistry::LoadProfileDataSource()
       }
     }
 
+    // We have to flush the chrome cache!
+    rv = FlushCaches();
+    if (NS_FAILED(rv)) return rv;
+
     rv = LoadStyleSheet(getter_AddRefs(mScrollbarSheet), NS_LITERAL_CSTRING("chrome://global/skin/scrollbars.css"));
     // This must always be the last line of profile initialization!