diff --git a/mozilla/docshell/base/nsDSURIContentListener.cpp b/mozilla/docshell/base/nsDSURIContentListener.cpp
index 3a8f92fb09a..0f55c96e6b3 100644
--- a/mozilla/docshell/base/nsDSURIContentListener.cpp
+++ b/mozilla/docshell/base/nsDSURIContentListener.cpp
@@ -60,13 +60,13 @@ NS_IMETHODIMP nsDSURIContentListener::GetProtocolHandler(nsIURI* aURI,
    return NS_OK;
 }
 
-NS_IMETHODIMP nsDSURIContentListener::DoContent(const char* aContentType,
-   const char* aCommand, const char* aWindowTarget, nsIChannel* aOpenedChannel,
+NS_IMETHODIMP nsDSURIContentListener::DoContent(const char* aContentType, nsURILoadCommand aCommand, 
+   const char* aWindowTarget, nsIChannel* aOpenedChannel,
    nsIStreamListener** aContentHandler, PRBool* aAbortProcess)
 {
    NS_ENSURE_ARG_POINTER(aContentHandler && aAbortProcess);
 
-   if(HandleInCurrentDocShell(aContentType, aCommand, aWindowTarget, 
+   if(HandleInCurrentDocShell(aContentType, "view", aWindowTarget, 
       aOpenedChannel, aContentHandler))
       { 
       // In this condition content will start to be directed here.
@@ -85,7 +85,7 @@ NS_IMETHODIMP nsDSURIContentListener::DoContent(const char* aContentType,
 }
 
 NS_IMETHODIMP nsDSURIContentListener::CanHandleContent(const char* aContentType,
-   const char* aCommand, const char* aWindowTarget, char ** aDesiredContentType, PRBool* aCanHandle)
+   nsURILoadCommand aCommand, const char* aWindowTarget, char ** aDesiredContentType, PRBool* aCanHandle)
 {
    NS_ENSURE_ARG_POINTER(aCanHandle);
    NS_ENSURE_ARG_POINTER(aDesiredContentType);
diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 1879c91bed3..b8284dee34e 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -134,7 +134,7 @@ NS_IMETHODIMP nsDocShell::LoadURIVia(nsIURI* aUri,
    NS_ENSURE_SUCCESS(EnsureContentListener(), NS_ERROR_FAILURE);
    mContentListener->SetPresContext(aPresContext);
 
-   NS_ENSURE_SUCCESS(uriLoader->OpenURIVia(aUri, nsnull, 
+   NS_ENSURE_SUCCESS(uriLoader->OpenURIVia(aUri, nsIURILoader::viewNormal, nsnull, 
       NS_STATIC_CAST(nsIDocShell*, this), nsnull, mLoadCookie, 
       getter_AddRefs(mLoadCookie), aAdapterBinding), NS_ERROR_FAILURE);