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

bug #94205 (r=adamlock@netscape.com, sr=jst@netscape.com) nsIWebNavigation interface changes...

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@109390 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
2001-11-30 22:35:33 +00:00
parent 5a413592bd
commit 2faee254d0
42 changed files with 282 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -337,7 +337,12 @@ nsresult nsWebShellWindow::Initialize(nsIXULWindow* aParent,
nsCRT::free(tmpStr);
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(mDocShell));
NS_ENSURE_TRUE(webNav, NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(webNav->LoadURI(urlString.get(), nsIWebNavigation::LOAD_FLAGS_NONE), NS_ERROR_FAILURE);
rv = webNav->LoadURI(urlString.get(),
nsIWebNavigation::LOAD_FLAGS_NONE,
nsnull,
nsnull,
nsnull);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
}
return rv;
@@ -1459,7 +1464,11 @@ void nsWebShellWindow::LoadContentAreas() {
nsUnescape(urlChar);
contentURL.AssignWithConversion(urlChar);
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(contentShell));
webNav->LoadURI(contentURL.get(), nsIWebNavigation::LOAD_FLAGS_NONE);
webNav->LoadURI(contentURL.get(),
nsIWebNavigation::LOAD_FLAGS_NONE,
nsnull,
nsnull,
nsnull);
delete [] urlChar;
}
NS_RELEASE(contentShell);