diff --git a/mozilla/xpfe/appshell/public/nsIAppShellService.idl b/mozilla/xpfe/appshell/public/nsIAppShellService.idl index 13a07bc09bf..7ffafd2b73c 100644 --- a/mozilla/xpfe/appshell/public/nsIAppShellService.idl +++ b/mozilla/xpfe/appshell/public/nsIAppShellService.idl @@ -132,6 +132,9 @@ interface nsIAppShellService : nsISupports in PRUint32 aChromeMask, in nsIXULWindowCallbacks aCallbacks, in long aInitialWidth, in long aInitialHeight); + + // Apply Initialize function to each app shell component. + void EnumerateAndInitializeComponents(); /** * Close a window. diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index c14e2e9544a..b7d15ed2a68 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -243,8 +243,7 @@ nsAppShellService::Initialize( nsICmdLineService *aCmdLineService ) goto done; } - // Initialize each registered component. - EnumerateComponents( &nsAppShellService::InitializeComponent ); + // enable window mediation rv = nsServiceManager::GetService(kWindowMediatorCID, kIWindowMediatorIID, @@ -280,6 +279,12 @@ void nsAppShellService::CreateHiddenWindow() NS_ASSERTION(NS_SUCCEEDED(rv), "HiddenWindow not created"); } + NS_IMETHODIMP nsAppShellService::EnumerateAndInitializeComponents(void) + { + // Initialize each registered component. + EnumerateComponents( &nsAppShellService::InitializeComponent ); + return NS_OK; + } // Apply function (Initialize/Shutdown) to each app shell component. void nsAppShellService::EnumerateComponents( EnumeratorMemberFunction function ) {