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

Change nsIWebShell::LoadURL calls to use nsIWebNavigation::LoadURI.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@63122 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
tbogard%aol.net
2000-03-16 02:20:26 +00:00
parent 5ad7fd8354
commit 854e3803a9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
View File

@@ -44,6 +44,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#include "nsPIDOMWindow.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMFocusListener.h"
#include "nsIWebNavigation.h"
#include "nsIXULPopupListener.h"
#include "nsIDOMXULElement.h"
@@ -349,7 +350,9 @@ nsresult nsWebShellWindow::Initialize(nsIXULWindow* aParent,
if (NS_FAILED(rv)) return rv;
urlString = tmpStr;
nsCRT::free(tmpStr);
rv = mWebShell->LoadURL(urlString.GetUnicode());
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(mDocShell));
NS_ENSURE_TRUE(webNav, NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(webNav->LoadURI(urlString.GetUnicode()), NS_ERROR_FAILURE);
}
return rv;
@@ -1519,7 +1522,8 @@ void nsWebShellWindow::LoadContentAreas() {
if (urlChar) {
nsUnescape(urlChar);
contentURL = urlChar;
contentShell->LoadURL(contentURL.GetUnicode());
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(contentShell));
webNav->LoadURI(contentURL.GetUnicode());
delete [] urlChar;
}
NS_RELEASE(contentShell);