mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-20 08:51:04 +00:00
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:
parent
38bfb4eec9
commit
0fa48ad4b1
@ -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) {
|
||||
|
@ -224,6 +224,7 @@ protected:
|
||||
|
||||
nsCOMPtr<nsIRDFCompositeDataSource> mChromeDataSource;
|
||||
nsCOMPtr<nsIRDFDataSource> mInstallDirChromeDataSource;
|
||||
nsCOMPtr<nsIRDFDataSource> mUIDataSource;
|
||||
|
||||
nsSupportsHashtable* mDataSourceTable;
|
||||
nsIRDFService* mRDFService;
|
||||
|
@ -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) {
|
||||
|
@ -224,6 +224,7 @@ protected:
|
||||
|
||||
nsCOMPtr<nsIRDFCompositeDataSource> mChromeDataSource;
|
||||
nsCOMPtr<nsIRDFDataSource> mInstallDirChromeDataSource;
|
||||
nsCOMPtr<nsIRDFDataSource> mUIDataSource;
|
||||
|
||||
nsSupportsHashtable* mDataSourceTable;
|
||||
nsIRDFService* mRDFService;
|
||||
|
Loading…
x
Reference in New Issue
Block a user