2nd patch for bug 158080

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@235806 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
henry.jia%sun.com
2007-09-12 17:50:11 +00:00
parent 53ce02351f
commit 639c45905a

View File

@@ -2438,7 +2438,7 @@ nsBookmarksService::OnStopRequest(nsIRequest* request, nsISupports *ctxt,
interfaces->GetInterface(NS_GET_IID(nsIPrompt), getter_AddRefs(prompter));
if (!prompter)
{
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
if (wwatch)
wwatch->GetNewPrompter(0, getter_AddRefs(prompter));
}
@@ -2511,7 +2511,7 @@ nsBookmarksService::OnStopRequest(nsIRequest* request, nsISupports *ctxt,
{
if (NS_SUCCEEDED(rv))
{
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
if (wwatch)
{
nsCOMPtr<nsIDOMWindow> newWindow;