Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final part of fix for bug 132175 - switch consumers over to new interface

Browse Source 
r=bnesse, rs=waterson


git-svn-id: svn://10.0.0.236/trunk@124133 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com 2002-06-26 22:55:49 +00:00
parent 9345c5817f
commit 5afc1a8426
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/extensions/inspector/resources/content/inspector.js
View File

@ -49,7 +49,7 @@ var inspector;
const kSearchRegURL = "resource:///res/inspector/search-registry.rdf";
const kWindowMediatorCID = "@mozilla.org/appshell/window-mediator;1";
const kWindowDataSourceCID = "@mozilla.org/rdf/datasource;1?name=window-mediator";
const kClipboardHelperCID = "@mozilla.org/widget/clipboardhelper;1";
const nsIWebNavigation = Components.interfaces.nsIWebNavigation;
@ -312,7 +312,7 @@ InspectorApp.prototype =
setTargetWindowById: function(aResId)
{
var windowManager = XPCU.getService(kWindowMediatorCID, "nsIWindowMediator");
var windowManager = XPCU.getService(kWindowDataSourceCID, "nsIWindowDataSource");
var win = windowManager.getWindowForResource(aResId);
if (win) {

11
mozilla/xpfe/communicator/resources/content/tasksOverlay.js
View File

@ -38,6 +38,7 @@
const nsIDOMWindowInternal = Components.interfaces.nsIDOMWindowInternal;
const nsIWindowMediator = Components.interfaces.nsIWindowMediator;
const nsIWindowDataSource = Components.interfaces.nsIWindowDataSource;
function toNavigator()
{
@ -162,12 +163,11 @@ function CycleWindow( aType )
function ShowWindowFromResource( node )
{
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
var windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);
var windowManagerDS = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(nsIWindowDataSource);
var desiredWindow = null;
var url = node.getAttribute('id');
desiredWindow = windowManagerInterface.getWindowForResource( url );
desiredWindow = windowManagerDS.getWindowForResource( url );
if ( desiredWindow )
{
desiredWindow.focus();
@ -190,14 +190,13 @@ function ShowUpdateFromResource( node )
function checkFocusedWindow()
{
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
var windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);
var windowManagerDS = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService(nsIWindowDataSource);
var sep = document.getElementById("sep-window-list");
// Using double parens to avoid warning
while ((sep = sep.nextSibling)) {
var url = sep.getAttribute('id');
var win = windowManagerInterface.getWindowForResource(url);
var win = windowManagerDS.getWindowForResource(url);
if (win == window) {
sep.setAttribute("checked", "true");
break;