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

Chrome home pages broken b=301073 r+sr=dveditz a=CTho,IanN

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_0_BRANCH@186795 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk
2006-01-01 16:41:22 +00:00
parent aeb5c43c4c
commit 2fff7af0fb
5 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/xpfe/bootstrap/nsNativeAppSupportOS2.cpp
View File

@@ -1882,7 +1882,9 @@ nsNativeAppSupportOS2::HandleRequest( LPBYTE request, PRBool newWindow, nsIDOMWi
// first see if there is a url
nsXPIDLCString arg;
rv = args->GetURLToLoad(getter_Copies(arg));
if (NS_SUCCEEDED(rv) && !arg.IsEmpty() ) {
if (NS_FAILED(rv)) return;
if (!arg.IsEmpty() ) {
// Launch browser.
#if MOZ_DEBUG_DDE
printf( "Launching browser on url [%s]...\n", arg.get() );

4
mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
View File

@@ -1814,7 +1814,9 @@ nsNativeAppSupportWin::HandleRequest( LPBYTE request, PRBool newWindow, nsIDOMWi
// first see if there is a url
nsXPIDLCString arg;
rv = args->GetURLToLoad(getter_Copies(arg));
if (NS_SUCCEEDED(rv) && !arg.IsEmpty() ) {
if (NS_FAILED(rv)) return;
if (!arg.IsEmpty() ) {
// Launch browser.
#if MOZ_DEBUG_DDE
printf( "Launching browser on url [%s]...\n", arg.get() );

22
mozilla/xpfe/browser/resources/content/navigator.js
View File

@@ -438,16 +438,9 @@ function nsBrowserAccess() {
nsBrowserAccess.prototype = {
openURI: function openURI(aURI, aOpener, aWhere, aContext) {
var isExternal = (aContext == nsIBrowserDOMWindow.OPEN_EXTERNAL);
if (isExternal && aURI && aURI.schemeIs("chrome")) {
dump("use -chrome command-line option to load external chrome urls\n");
return null;
}
var loadflags = isExternal ?
nsIWebNavigation.LOAD_FLAGS_FROM_EXTERNAL :
nsIWebNavigation.LOAD_FLAGS_NONE;
var loadflags = aContext == nsIBrowserDOMWindow.OPEN_EXTERNAL ?
nsIWebNavigation.LOAD_FLAGS_FROM_EXTERNAL :
nsIWebNavigation.LOAD_FLAGS_NONE;
if (aWhere == nsIBrowserDOMWindow.OPEN_DEFAULTWINDOW)
if (aContext == nsIBrowserDOMWindow.OPEN_EXTERNAL)
@@ -642,15 +635,6 @@ function Startup()
browser.popupUrls = [];
browser.popupFeatures = [];
try {
if (makeURI(uriToLoad).schemeIs("chrome")) {
dump("*** Preventing external load of chrome: URI into browser window\n");
dump(" Use -chrome <uri> instead\n");
window.close();
return;
}
} catch (e) {}
if (uriToLoad != "about:blank") {
gURLBar.value = uriToLoad;
browser.userTypedValue = uriToLoad;

2
mozilla/xpfe/components/startup/src/nsAppStartup.cpp
View File

@@ -806,8 +806,6 @@ nsAppStartup::OpenBrowserWindow(PRInt32 height, PRInt32 width)
nsXPIDLCString urlToLoad;
rv = cmdLine->GetURLToLoad(getter_Copies(urlToLoad));
if (NS_FAILED(rv)) return rv;
if (!urlToLoad.IsEmpty()) {
#ifdef DEBUG_CMD_LINE

9
mozilla/xpfe/components/startup/src/nsCommandLineService.cpp
View File

@@ -215,8 +215,13 @@ nsCmdLineService::Initialize(int aArgc, char ** aArgv)
NS_IMETHODIMP
nsCmdLineService::GetURLToLoad(char ** aResult)
{
return GetCmdLineValue("-url", aResult);
nsresult rv = GetCmdLineValue("-url", aResult);
if (NS_SUCCEEDED(rv) && *aResult && !strncmp(*aResult, "chrome:", 7)) {
nsMemory::Free(*aResult);
*aResult = nsnull;
return NS_ERROR_INVALID_ARG;
}
return rv;
}
NS_IMETHODIMP