Backing out checkin for bug 210216 because it caused regression bugs 210377 and 210437 (themes and extensions missing from UI). r=ben, sr=hyatt.

This commit is contained in:
bryner%netscape.com 2003-06-24 22:04:43 +00:00
parent 38bfb4eec9
commit 0fa48ad4b1
4 changed files with 10 additions and 0 deletions

View File

@ -3057,6 +3057,10 @@ nsChromeRegistry::AddToCompositeDataSource(PRBool aUseProfile)
getter_AddRefs(mChromeDataSource));
if (NS_FAILED(rv))
return rv;
// Also create and hold on to our UI data source.
rv = NS_NewChromeUIDataSource(mChromeDataSource, getter_AddRefs(mUIDataSource));
if (NS_FAILED(rv)) return rv;
}
if (aUseProfile) {

View File

@ -224,6 +224,7 @@ protected:
nsCOMPtr<nsIRDFCompositeDataSource> mChromeDataSource;
nsCOMPtr<nsIRDFDataSource> mInstallDirChromeDataSource;
nsCOMPtr<nsIRDFDataSource> mUIDataSource;
nsSupportsHashtable* mDataSourceTable;
nsIRDFService* mRDFService;

View File

@ -3057,6 +3057,10 @@ nsChromeRegistry::AddToCompositeDataSource(PRBool aUseProfile)
getter_AddRefs(mChromeDataSource));
if (NS_FAILED(rv))
return rv;
// Also create and hold on to our UI data source.
rv = NS_NewChromeUIDataSource(mChromeDataSource, getter_AddRefs(mUIDataSource));
if (NS_FAILED(rv)) return rv;
}
if (aUseProfile) {

View File

@ -224,6 +224,7 @@ protected:
nsCOMPtr<nsIRDFCompositeDataSource> mChromeDataSource;
nsCOMPtr<nsIRDFDataSource> mInstallDirChromeDataSource;
nsCOMPtr<nsIRDFDataSource> mUIDataSource;
nsSupportsHashtable* mDataSourceTable;
nsIRDFService* mRDFService;