Fix for bug 138299 - switch consumers of nsIWindowMediator service to use the non-RDF contractID, in preparation for bug 132175

r=danm, sr=jag
This commit is contained in:
alecf%netscape.com 2006-07-29 05:40:38 +00:00
parent af9e659772
commit e072b22821
3 changed files with 7 additions and 7 deletions

View File

@ -52,7 +52,7 @@ function onLoad()
dialog.openTopWindow.setAttribute("label", dialog.bundle.getString("existingNavigatorWindow"));
// Find most recent browser window
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
if (windowManagerInterface)
browser = windowManagerInterface.getMostRecentWindow( "navigator:browser" );

View File

@ -75,7 +75,7 @@ function toJavaConsole()
function toOpenWindowByType( inType, uri )
{
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
var windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);
@ -117,7 +117,7 @@ function OpenBrowserWindow()
function CycleWindow( aType )
{
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
var windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);
var topWindowOfType = windowManagerInterface.getMostRecentWindow( aType );
@ -152,7 +152,7 @@ function CycleWindow( aType )
function ShowWindowFromResource( node )
{
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
var windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);
var desiredWindow = null;
@ -180,7 +180,7 @@ function ShowUpdateFromResource( node )
function checkFocusedWindow()
{
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
var windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);
var sep = document.getElementById("sep-window-list");

View File

@ -158,7 +158,7 @@ function goPreferences(containerID, paneURL, itemID)
}
//check for an existing pref window and focus it; it's not application modal
const kWindowMediatorContractID = "@mozilla.org/rdf/datasource;1?name=window-mediator";
const kWindowMediatorContractID = "@mozilla.org/appshell/window-mediator;1";
const kWindowMediatorIID = Components.interfaces.nsIWindowMediator;
const kWindowMediator = Components.classes[kWindowMediatorContractID].getService(kWindowMediatorIID);
var lastPrefWindow = kWindowMediator.getMostRecentWindow("mozilla:preferences");
@ -246,7 +246,7 @@ function openTopWin( url )
url = "about:blank";
}
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
var topWindowOfType = windowManagerInterface.getMostRecentWindow( "navigator:browser" );