diff --git a/mozilla/editor/ui/composer/content/ComposerCommands.js b/mozilla/editor/ui/composer/content/ComposerCommands.js index 1db352e87ae..70ffcdc0d06 100644 --- a/mozilla/editor/ui/composer/content/ComposerCommands.js +++ b/mozilla/editor/ui/composer/content/ComposerCommands.js @@ -1880,7 +1880,7 @@ var nsPreviewCommand = var browser; try { // Find a browser with this URL - 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 enumerator = windowManagerInterface.getEnumerator("navigator:browser"); diff --git a/mozilla/editor/ui/composer/content/editor.js b/mozilla/editor/ui/composer/content/editor.js index 43a49ac915c..4ba7cac839d 100644 --- a/mozilla/editor/ui/composer/content/editor.js +++ b/mozilla/editor/ui/composer/content/editor.js @@ -2666,7 +2666,7 @@ function SwitchInsertCharToThisWindow(windowWithDialog) function FindEditorWithInsertCharDialog() { // Find window with an InsertCharsWindow and switch association to this one - 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 enumerator = windowManagerInterface.getEnumerator( null ); @@ -2710,7 +2710,7 @@ function SwitchInsertCharToAnotherEditorOrClose() { if ("InsertCharWindow" in window && window.InsertCharWindow) { - 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 enumerator = windowManagerInterface.getEnumerator( null ); diff --git a/mozilla/editor/ui/composer/content/editorApplicationOverlay.js b/mozilla/editor/ui/composer/content/editorApplicationOverlay.js index 9f3f5750388..4c8f9ff4d1a 100644 --- a/mozilla/editor/ui/composer/content/editorApplicationOverlay.js +++ b/mozilla/editor/ui/composer/content/editorApplicationOverlay.js @@ -121,7 +121,7 @@ function editPage(url, launchWindow, delay) try { var uri = createURI(url, null, null); - 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 enumerator = windowManagerInterface.getEnumerator( "composer:html" ); var emptyWindow; diff --git a/mozilla/extensions/help/resources/content/contextHelp.js b/mozilla/extensions/help/resources/content/contextHelp.js index fe808e40dd2..5e6a1b991cd 100755 --- a/mozilla/extensions/help/resources/content/contextHelp.js +++ b/mozilla/extensions/help/resources/content/contextHelp.js @@ -21,7 +21,7 @@ function setHelpFileURI(rdfURI) { // Locate mozilla:help window (if any) opened for this help file uri. function locateHelpWindow(helpFileURI) { - 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 iterator = windowManagerInterface.getEnumerator( "mozilla:help"); var topWindow = null; diff --git a/mozilla/extensions/inspector/resources/content/inspector.js b/mozilla/extensions/inspector/resources/content/inspector.js index 5a733aeb8c3..5c505726968 100644 --- a/mozilla/extensions/inspector/resources/content/inspector.js +++ b/mozilla/extensions/inspector/resources/content/inspector.js @@ -49,7 +49,7 @@ var inspector; const kSearchRegURL = "resource:///res/inspector/search-registry.rdf"; -const kWindowMediatorCID = "@mozilla.org/rdf/datasource;1?name=window-mediator"; +const kWindowMediatorCID = "@mozilla.org/appshell/window-mediator;1"; const kClipboardHelperCID = "@mozilla.org/widget/clipboardhelper;1"; const nsIWebNavigation = Components.interfaces.nsIWebNavigation; diff --git a/mozilla/extensions/irc/js/lib/chatzilla-service.js b/mozilla/extensions/irc/js/lib/chatzilla-service.js index f23024c0f0c..6796d18209d 100644 --- a/mozilla/extensions/irc/js/lib/chatzilla-service.js +++ b/mozilla/extensions/irc/js/lib/chatzilla-service.js @@ -49,7 +49,7 @@ const IRCPROT_HANDLER_CID = /* components used in this file */ const MEDIATOR_CONTRACTID = - "@mozilla.org/rdf/datasource;1?name=window-mediator"; + "@mozilla.org/appshell/window-mediator;1"; const STANDARDURL_CONTRACTID = "@mozilla.org/network/standard-url;1"; const ASS_CONTRACTID = diff --git a/mozilla/extensions/venkman/resources/content/venkman-utils.js b/mozilla/extensions/venkman/resources/content/venkman-utils.js index efc1f1a999b..32bac794b30 100644 --- a/mozilla/extensions/venkman/resources/content/venkman-utils.js +++ b/mozilla/extensions/venkman/resources/content/venkman-utils.js @@ -183,7 +183,7 @@ function dumpObjectTree (o, recurse, compress, level) function getWindowByType (windowType) { const MEDIATOR_CONTRACTID = - "@mozilla.org/rdf/datasource;1?name=window-mediator"; + "@mozilla.org/appshell/window-mediator;1"; const nsIWindowMediator = Components.interfaces.nsIWindowMediator; var windowManager = diff --git a/mozilla/extensions/xmlterm/ui/xmlterm-service.js b/mozilla/extensions/xmlterm/ui/xmlterm-service.js index 3c26ad484c2..3c596394a8c 100644 --- a/mozilla/extensions/xmlterm/ui/xmlterm-service.js +++ b/mozilla/extensions/xmlterm/ui/xmlterm-service.js @@ -50,7 +50,7 @@ const XMLTERMPROT_HANDLER_CID = /* components used in this file */ const MEDIATOR_CONTRACTID = - "@mozilla.org/rdf/datasource;1?name=window-mediator" + "@mozilla.org/appshell/window-mediator;1" const SIMPLEURI_CONTRACTID = "@mozilla.org/network/simple-uri;1"; const ASS_CONTRACTID = diff --git a/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul b/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul index 0f3b590655b..aec0b0e230a 100644 --- a/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul +++ b/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul @@ -14,7 +14,7 @@ { try { - var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(); + var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); var iwindowManager = Components.interfaces.nsIWindowMediator; var windowManager = cwindowManager.QueryInterface(iwindowManager); var mailWindow = windowManager.getMostRecentWindow('mail:3pane'); diff --git a/mozilla/mailnews/base/resources/content/mailOverlay.xul b/mozilla/mailnews/base/resources/content/mailOverlay.xul index f17839fb686..97ebc54ca87 100644 --- a/mozilla/mailnews/base/resources/content/mailOverlay.xul +++ b/mozilla/mailnews/base/resources/content/mailOverlay.xul @@ -20,7 +20,7 @@ { try { - var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(); + var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); var iwindowManager = Components.interfaces.nsIWindowMediator; var windowManager = cwindowManager.QueryInterface(iwindowManager); var mailWindow = windowManager.getMostRecentWindow('mail:3pane'); diff --git a/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul b/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul index b5bee22bde6..6bab5fd9ae8 100644 --- a/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul +++ b/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul @@ -49,7 +49,7 @@ var preselectedFolder = null; if ("GetFirstSelectedMsgFolder" in window) preselectedFolder = GetFirstSelectedMsgFolder(); - 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 searchWindow = windowManagerInterface.getMostRecentWindow("mailnews:search"); @@ -62,7 +62,7 @@ function MsgSearchAddresses() { - 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 abSearchWindow = windowManagerInterface.getMostRecentWindow("mailnews:absearch"); diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js index 3e49793d41d..d1f6afef487 100644 --- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js +++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js @@ -533,7 +533,7 @@ function GetWindowMediator() if (gWindowManagerInterface) return gWindowManagerInterface; - var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(); + var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); return (gWindowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator)); } diff --git a/mozilla/mailnews/base/resources/content/widgetglue.js b/mozilla/mailnews/base/resources/content/widgetglue.js index 63f3ba88b0a..f4cb73e5df2 100644 --- a/mozilla/mailnews/base/resources/content/widgetglue.js +++ b/mozilla/mailnews/base/resources/content/widgetglue.js @@ -241,7 +241,7 @@ function NotifyQuitApplication() function LastToClose() { - 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 enumerator = windowManagerInterface.getEnumerator( null ); var count = 0; diff --git a/mozilla/mailnews/extensions/smoketest/resources/content/mailSmoketestOverlay.js b/mozilla/mailnews/extensions/smoketest/resources/content/mailSmoketestOverlay.js index 5b11f9efcf1..7994fff430f 100644 --- a/mozilla/mailnews/extensions/smoketest/resources/content/mailSmoketestOverlay.js +++ b/mozilla/mailnews/extensions/smoketest/resources/content/mailSmoketestOverlay.js @@ -42,7 +42,7 @@ function SelectInboxFolderMessage() function SendMessageNow() { - var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(); + var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); var iwindowManager = Components.interfaces.nsIWindowMediator; var windowManager = cwindowManager.QueryInterface(iwindowManager); var composeWindow = windowManager.getMostRecentWindow('msgcompose'); //find the open msgcompose window and get it diff --git a/mozilla/xpfe/appshell/src/nsCloseAllWindows.js b/mozilla/xpfe/appshell/src/nsCloseAllWindows.js index d92500a0413..6f3e0fdfbeb 100644 --- a/mozilla/xpfe/appshell/src/nsCloseAllWindows.js +++ b/mozilla/xpfe/appshell/src/nsCloseAllWindows.js @@ -64,7 +64,7 @@ nsCloseAllWindows.prototype = { // closeAll: Close all open windows closeAll: function(aAskToSave) { - var windowMediator = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator']. + var windowMediator = Components.classes['@mozilla.org/appshell/window-mediator;1']. getService(Components.interfaces.nsIWindowMediator); var enumerator = windowMediator.getEnumerator(null); diff --git a/mozilla/xpfe/appshell/src/nsXULWindow.cpp b/mozilla/xpfe/appshell/src/nsXULWindow.cpp index 4d2f44774fb..73cdd847f3e 100644 --- a/mozilla/xpfe/appshell/src/nsXULWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsXULWindow.cpp @@ -1003,7 +1003,7 @@ void nsXULWindow::StaggerPosition(PRInt32 &aRequestedX, PRInt32 &aRequestedY, PRBool keepTrying; // look for any other windows of this type - nsCOMPtr wm(do_GetService("@mozilla.org/rdf/datasource;1?name=window-mediator")); + nsCOMPtr wm(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID)); if (!wm) return; diff --git a/mozilla/xpfe/browser/resources/content/fastnav.js b/mozilla/xpfe/browser/resources/content/fastnav.js index 94147333d49..232912ff6bd 100644 --- a/mozilla/xpfe/browser/resources/content/fastnav.js +++ b/mozilla/xpfe/browser/resources/content/fastnav.js @@ -647,7 +647,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr) } if (forceDialogFlag || searchMode == 1) { // Use a single search dialog - var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"] + var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var searchWindow = windowManager.getMostRecentWindow("search:window"); @@ -740,7 +740,7 @@ function enableBookmarks() function BrowserEditBookmarks() { // Use a single sidebar bookmarks dialog - var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"] + var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var bookmarksWindow = windowManager.getMostRecentWindow("bookmarks:manager"); diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js index 601d5db394d..66aa8170e8e 100644 --- a/mozilla/xpfe/browser/resources/content/navigator.js +++ b/mozilla/xpfe/browser/resources/content/navigator.js @@ -818,7 +818,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr, newWindowFlag) if (forceDialogFlag || searchMode == 1) { // Use a single search dialog - var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"] + var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var searchWindow = windowManager.getMostRecentWindow("search:window"); @@ -942,7 +942,7 @@ function enableBookmarks() function BrowserEditBookmarks() { // Use a single sidebar bookmarks dialog - var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"] + var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var bookmarksWindow = windowManager.getMostRecentWindow("bookmarks:manager"); @@ -1729,7 +1729,7 @@ function toHistory() { // Use a single sidebar history dialog - var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(); + var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); var iwindowManager = Components.interfaces.nsIWindowMediator; var windowManager = cwindowManager.QueryInterface(iwindowManager); diff --git a/mozilla/xpfe/browser/resources/content/nsBrowserContentListener.js b/mozilla/xpfe/browser/resources/content/nsBrowserContentListener.js index 0479afbc942..2e3238dbc6f 100644 --- a/mozilla/xpfe/browser/resources/content/nsBrowserContentListener.js +++ b/mozilla/xpfe/browser/resources/content/nsBrowserContentListener.js @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -const mediatorContractId = "@mozilla.org/rdf/datasource;1?name=window-mediator"; +const mediatorContractId = "@mozilla.org/appshell/window-mediator;1"; const nsIWebBrowserChrome = Components.interfaces.nsIWebBrowserChrome; function nsBrowserContentListener(toplevelWindow, contentWindow) diff --git a/mozilla/xpfe/communicator/resources/content/openLocation.js b/mozilla/xpfe/communicator/resources/content/openLocation.js index 5b8eb3f67b8..35deec3cc51 100644 --- a/mozilla/xpfe/communicator/resources/content/openLocation.js +++ b/mozilla/xpfe/communicator/resources/content/openLocation.js @@ -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" ); diff --git a/mozilla/xpfe/communicator/resources/content/tasksOverlay.js b/mozilla/xpfe/communicator/resources/content/tasksOverlay.js index bb6ba9d13e9..f792b4a2292 100644 --- a/mozilla/xpfe/communicator/resources/content/tasksOverlay.js +++ b/mozilla/xpfe/communicator/resources/content/tasksOverlay.js @@ -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"); diff --git a/mozilla/xpfe/communicator/resources/content/utilityOverlay.js b/mozilla/xpfe/communicator/resources/content/utilityOverlay.js index 3e602f24563..f242d5e3013 100644 --- a/mozilla/xpfe/communicator/resources/content/utilityOverlay.js +++ b/mozilla/xpfe/communicator/resources/content/utilityOverlay.js @@ -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" ); diff --git a/mozilla/xpfe/components/bookmarks/resources/findBookmark.js b/mozilla/xpfe/components/bookmarks/resources/findBookmark.js index 03198977c83..3b6ec664f8e 100644 --- a/mozilla/xpfe/components/bookmarks/resources/findBookmark.js +++ b/mozilla/xpfe/components/bookmarks/resources/findBookmark.js @@ -83,7 +83,7 @@ function find() function findMostRecentWindow(aType, aURI, aParam) { - var WM = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(); + var WM = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); WM = WM.QueryInterface(Components.interfaces.nsIWindowMediator); var topWindow = WM.getMostRecentWindow(aType); if (!topWindow) gCreatingNewWindow = true; diff --git a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp index ed0b4081473..948569a7d5a 100644 --- a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp +++ b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp @@ -641,7 +641,7 @@ nsDownloadManager::Open(nsIDOMWindow* aParent) //check for an existing manager window and focus it nsresult rv; - nsCOMPtr wm = do_GetService("@mozilla.org/rdf/datasource;1?name=window-mediator", &rv); + nsCOMPtr wm = do_GetService(NS_WINDOWMEDIATOR_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr recentWindow; diff --git a/mozilla/xpfe/components/history/resources/findHistory.js b/mozilla/xpfe/components/history/resources/findHistory.js index 4fc8d0b65b6..bbcfb8de59b 100644 --- a/mozilla/xpfe/components/history/resources/findHistory.js +++ b/mozilla/xpfe/components/history/resources/findHistory.js @@ -71,7 +71,7 @@ function find() var gCreatingNewWindow = false; function findMostRecentWindow(aType, aURI, aParam) { - var WM = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(); + var WM = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); WM = WM.QueryInterface(Components.interfaces.nsIWindowMediator); var topWindow = WM.getMostRecentWindow(aType); if (!topWindow) gCreatingNewWindow = true; diff --git a/mozilla/xpfe/components/history/resources/history.js b/mozilla/xpfe/components/history/resources/history.js index a58c8565424..a0f7a991c50 100644 --- a/mozilla/xpfe/components/history/resources/history.js +++ b/mozilla/xpfe/components/history/resources/history.js @@ -422,7 +422,7 @@ function updateItems() copyLocationItem.removeAttribute("hidden"); sep1.removeAttribute("hidden"); if (!gWindowManager) { - gWindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(); + gWindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); gWindowManager = gWindowManager.QueryInterface( Components.interfaces.nsIWindowMediator); } var topWindowOfType = gWindowManager.getMostRecentWindow("navigator:browser"); diff --git a/mozilla/xpfe/components/search/resources/search-panel.js b/mozilla/xpfe/components/search/resources/search-panel.js index 9d5dc471c28..caad4c6104b 100644 --- a/mozilla/xpfe/components/search/resources/search-panel.js +++ b/mozilla/xpfe/components/search/resources/search-panel.js @@ -42,7 +42,7 @@ * * ***** END LICENSE BLOCK ***** */ -const WMEDIATOR_CONTRACTID = "@mozilla.org/rdf/datasource;1?name=window-mediator"; +const WMEDIATOR_CONTRACTID = "@mozilla.org/appshell/window-mediator;1"; const ISEARCH_CONTRACTID = "@mozilla.org/rdf/datasource;1?name=internetsearch"; const RDFSERVICE_CONTRACTID = "@mozilla.org/rdf/rdf-service;1"; const BMARKS_CONTRACTID = "@mozilla.org/browser/bookmarks-service;1"; diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js index ce8a8f8271e..f61c7eda11e 100644 --- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js +++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js @@ -1033,7 +1033,7 @@ function enable_customize() { // Bring up the Sidebar customize dialog. function SidebarCustomize() { // Use a single sidebar customize dialog - var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(); + var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(); var iwindowManager = Components.interfaces.nsIWindowMediator; var windowManager = cwindowManager.QueryInterface(iwindowManager); diff --git a/mozilla/xpfe/components/startup/src/nsCloseAllWindows.js b/mozilla/xpfe/components/startup/src/nsCloseAllWindows.js index d92500a0413..6f3e0fdfbeb 100644 --- a/mozilla/xpfe/components/startup/src/nsCloseAllWindows.js +++ b/mozilla/xpfe/components/startup/src/nsCloseAllWindows.js @@ -64,7 +64,7 @@ nsCloseAllWindows.prototype = { // closeAll: Close all open windows closeAll: function(aAskToSave) { - var windowMediator = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator']. + var windowMediator = Components.classes['@mozilla.org/appshell/window-mediator;1']. getService(Components.interfaces.nsIWindowMediator); var enumerator = windowMediator.getEnumerator(null); diff --git a/mozilla/xpfe/components/xremote/src/XRemoteService.cpp b/mozilla/xpfe/components/xremote/src/XRemoteService.cpp index e06f378cc96..739843ea326 100644 --- a/mozilla/xpfe/components/xremote/src/XRemoteService.cpp +++ b/mozilla/xpfe/components/xremote/src/XRemoteService.cpp @@ -44,7 +44,6 @@ #include #include #include -#include NS_DEFINE_CID(kWindowCID, NS_WINDOW_CID); @@ -845,8 +844,7 @@ XRemoteService::FindWindow(const PRUnichar *aType, nsIDOMWindowInternal **_retval) { nsCOMPtr mediator; - mediator = do_GetService(NS_RDF_DATASOURCE_CONTRACTID_PREFIX - "window-mediator"); + mediator = do_GetService(NS_WINDOWMEDIATOR_CONTRACTID); if (!mediator) return NS_ERROR_FAILURE; diff --git a/mozilla/xpfe/global/resources/content/globalOverlay.js b/mozilla/xpfe/global/resources/content/globalOverlay.js index ca3f416c3e9..6337526764d 100644 --- a/mozilla/xpfe/global/resources/content/globalOverlay.js +++ b/mozilla/xpfe/global/resources/content/globalOverlay.js @@ -14,7 +14,7 @@ function goQuitApplication() } } - 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 enumerator = windowManagerInterface.getEnumerator( null ); var appShell = Components.classes['@mozilla.org/appshell/appShellService;1'].getService();