From 5ccaaeea48559920386519c81fe4d6b9f9e4c2b9 Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Sun, 7 Nov 1999 09:57:56 +0000 Subject: [PATCH] Changed loadURI to take an nsIURI instead of a wstring. Added a read-only attribute to get the currently loaded URI. git-svn-id: svn://10.0.0.236/trunk@52925 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsIDocShell.idl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsIDocShell.idl b/mozilla/docshell/base/nsIDocShell.idl index 11569972022..243413fd76d 100644 --- a/mozilla/docshell/base/nsIDocShell.idl +++ b/mozilla/docshell/base/nsIDocShell.idl @@ -25,6 +25,7 @@ #include "domstubs.idl" #include "nsIPref.idl" #include "nsIURIContentListener.idl" +#include "nsIURI.idl" %{ C++ #include "nsIPresContext.h" @@ -62,7 +63,7 @@ interface nsIDocShell : nsISupports @param presContext - Presentation Context to use for the new URL. This may be null. */ - [noscript]void LoadURI(in wstring uri, in nsIPresContext presContext); + [noscript]void loadURI(in nsIURI uri, in nsIPresContext presContext); /* Loads a given URI through the specified adapter. This will give priority @@ -75,7 +76,7 @@ interface nsIDocShell : nsISupports may be null. @param adapterBinding - The local IP address of the adapter to bind to. */ - [noscript]void LoadURIVia(in wstring uri, in nsIPresContext presContext, + [noscript]void loadURIVia(in nsIURI uri, in nsIPresContext presContext, in unsigned long adapterBinding); /* @@ -92,6 +93,11 @@ interface nsIDocShell : nsISupports */ readonly attribute nsIDOMDocument document; + /* + The current URI that is loaded. + */ + readonly attribute nsIURI currentURI; + /* name of the DocShell */