Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 16:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nsIBrowserWindow::GoTo no longer takes the command parameter. Converted calls to nsIWebShell for loading an URL to use nsIWebNavigation interface instead.

Browse Source
This commit is contained in:
tbogard%aol.net 2000-03-29 10:27:08 +00:00
parent 87ffa7a323
commit 2f5c168c5e
2 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
webshell/tests/viewer/nsBrowserWindow.cpp
View File

@ -827,8 +827,8 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
url.Append("/test");
url.Append(ix, 10);
url.Append(".html");
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(mDocShell));
webShell->LoadURL(url.GetUnicode());
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(mWebBrowser));
webNav->LoadURI(url.GetUnicode());
}
break;
@ -836,16 +836,16 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
{
nsAutoString url(SAMPLES_BASE_URL);
url.Append("/toolbarTest1.xul");
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(mDocShell));
webShell->LoadURL(url.GetUnicode());
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(mWebBrowser));
webNav->LoadURI(url.GetUnicode());
break;
}
case VIEWER_XPTOOLKITTREE1:
{
nsAutoString url(SAMPLES_BASE_URL);
url.Append("/treeTest1.xul");
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(mDocShell));
webShell->LoadURL(url.GetUnicode());
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(mWebBrowser));
webNav->LoadURI(url.GetUnicode());
break;
}
@ -1016,8 +1016,8 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
}
/* invoke the javascript wallet editor */
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(mDocShell));
webShell->LoadURL(urlString.GetUnicode());
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(mWebBrowser));
webNav->LoadURI(urlString.GetUnicode());
}
break;
#endif
@ -1064,10 +1064,10 @@ nsBrowserWindow::Forward()
}
void
nsBrowserWindow::GoTo(const PRUnichar* aURL,const char* aCommand)
nsBrowserWindow::GoTo(const PRUnichar* aURL)
{
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(mDocShell));
webShell->LoadURL(aURL, aCommand, nsnull);
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(mWebBrowser));
webNav->LoadURI(aURL);
}
@ -1119,8 +1119,8 @@ nsBrowserWindow::DoFileOpen()
if (GetFileFromFileSelector(mWindow, fileSpec, mOpenFileDirectory)) {
nsFileURL fileURL(fileSpec);
// Ask the Web widget to load the file URL
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(mDocShell));
webShell->LoadURL(nsString(fileURL.GetURLString()).GetUnicode());
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(mWebBrowser));
webNav->LoadURI(nsString(fileURL.GetURLString()).GetUnicode());
SetVisibility(PR_TRUE);
}
}
@ -1404,16 +1404,15 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell,
mWindow->GetClientBounds(r);
// Create web shell
mWebBrowser = do_CreateInstance(NS_WEBBROWSER_PROGID, &rv);
/* rv = nsComponentManager::CreateInstance(kWebShellCID, nsnull,
NS_GET_IID(nsIDocShell),
(void**)&mDocShell);
*/ if (NS_OK != rv) {
return rv;
}
mWebBrowser = do_CreateInstance(NS_WEBBROWSER_PROGID);
NS_ENSURE_TRUE(mWebBrowser, NS_ERROR_FAILURE);
r.x = r.y = 0;
nsCOMPtr<nsIBaseWindow> webBrowserWin(do_QueryInterface(mWebBrowser));
rv = webBrowserWin->InitWindow(mWindow->GetNativeData(NS_NATIVE_WIDGET), nsnull, r.x, r.y, r.width, r.height);
NS_ENSURE_SUCCESS(EnsureWebBrowserChrome(), NS_ERROR_FAILURE);
mWebBrowser->SetTopLevelWindow(mWebBrowserChrome);
webBrowserWin->Create();
mWebBrowser->GetDocShell(&mDocShell);
mDocShell->SetAllowPlugins(aAllowPlugins);
@ -1421,10 +1420,6 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell,
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(mDocShell));
webShell->SetContainer((nsIWebShellContainer*) this);
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(mDocShell));
EnsureWebBrowserChrome();
docShellAsItem->SetTreeOwner(mWebBrowserChrome);
webShell->GetDocumentLoader(*getter_AddRefs(docLoader));
if (docLoader) {
docLoader->AddObserver(this);

2
webshell/tests/viewer/nsBrowserWindow.h
View File

@ -142,7 +142,7 @@ public:
void Layout(PRInt32 aWidth, PRInt32 aHeight);
void Back();
void Forward();
void GoTo(const PRUnichar* aURL,const char* aCommand=nsnull);
void GoTo(const PRUnichar* aURL);
void StartThrobber();
void StopThrobber();
void LoadThrobberImages();