Commit 0fa48ad4 authored by bryner%netscape.com's avatar bryner%netscape.com
Browse files

Backing out checkin for bug 210216 because it caused regression bugs 210377... 

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

chrome/src/nsChromeRegistry.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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) {

chrome/src/nsChromeRegistry.h

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ protected: 


  nsCOMPtr<nsIRDFCompositeDataSource> mChromeDataSource;

  nsCOMPtr<nsIRDFDataSource> mInstallDirChromeDataSource;

  nsCOMPtr<nsIRDFDataSource> mUIDataSource;



  nsSupportsHashtable* mDataSourceTable;

  nsIRDFService* mRDFService;

rdf/chrome/src/nsChromeRegistry.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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) {

rdf/chrome/src/nsChromeRegistry.h

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ protected: 


  nsCOMPtr<nsIRDFCompositeDataSource> mChromeDataSource;

  nsCOMPtr<nsIRDFDataSource> mInstallDirChromeDataSource;

  nsCOMPtr<nsIRDFDataSource> mUIDataSource;



  nsSupportsHashtable* mDataSourceTable;

  nsIRDFService* mRDFService;