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

5th patch for bug 158080

Browse Source 
Description: replace the hardcode of @mozilla.org/embedcomp/window-watcher;1 with NS_WINDOWWATCHER_CONTRACTID
Patch by Henry.Jia@sun.com
r=anto, sr=alecf


git-svn-id: svn://10.0.0.236/trunk@126456 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
henry.jia%sun.com
2002-08-06 06:20:45 +00:00
parent c863768990
commit 148ed167a2
18 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
View File

@@ -69,9 +69,6 @@
#include "nsIDragDropOverride.h"
#include "nsIContent.h"
static const char sWindowWatcherContractID[] = "@mozilla.org/embedcomp/window-watcher;1";
//
// GetEventReceiver
//
@@ -300,7 +297,7 @@ nsresult nsDocShellTreeOwner::FindItemWithNameAcrossWindows(
nsIDocShellTreeItem** aFoundItem)
{
// search for the item across the list of top-level windows
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(sWindowWatcherContractID));
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
if (!wwatch)
return NS_OK;
@@ -343,7 +340,7 @@ void nsDocShellTreeOwner::EnsurePrompter()
if (mPrompter)
return;
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
if (wwatch && mWebBrowser) {
nsCOMPtr<nsIDOMWindow> domWindow;
mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
@@ -357,7 +354,7 @@ void nsDocShellTreeOwner::EnsureAuthPrompter()
if (mAuthPrompter)
return;
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
if (wwatch && mWebBrowser) {
nsCOMPtr<nsIDOMWindow> domWindow;
mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
@@ -372,7 +369,7 @@ void nsDocShellTreeOwner::AddToWatcher() {
nsCOMPtr<nsIDOMWindow> domWindow;
mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
if (domWindow) {
nsCOMPtr<nsPIWindowWatcher> wwatch(do_GetService(sWindowWatcherContractID));
nsCOMPtr<nsPIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
if (wwatch)
wwatch->AddWindow(domWindow, mWebBrowserChrome);
}
@@ -385,7 +382,7 @@ void nsDocShellTreeOwner::RemoveFromWatcher() {
nsCOMPtr<nsIDOMWindow> domWindow;
mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
if (domWindow) {
nsCOMPtr<nsPIWindowWatcher> wwatch(do_GetService(sWindowWatcherContractID));
nsCOMPtr<nsPIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
if (wwatch)
wwatch->RemoveWindow(domWindow);
}