diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
| commit | b774b547788b74884b9eb690c548a6016e714023 (patch) | |
| tree | 72b9df09c0fc257169b3e9b9cbdc349e56a63101 /embed/mozilla/EphyBrowser.h | |
| parent | b699b40d663955560655271f7645ae277e6076c8 (diff) | |
| download | gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.gz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.bz2 gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.lz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.xz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.zst gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.zip | |
merge mozilla-embed-strings branch
Diffstat (limited to 'embed/mozilla/EphyBrowser.h')
| -rw-r--r-- | embed/mozilla/EphyBrowser.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h index f244fc60b..d8a6300bb 100644 --- a/embed/mozilla/EphyBrowser.h +++ b/embed/mozilla/EphyBrowser.h @@ -34,10 +34,6 @@ #include <nsIDOMWindow.h> #include <nsIPrintSettings.h> -#ifdef ALLOW_PRIVATE_STRINGS -#include "nsString.h" -#endif - #ifdef ALLOW_PRIVATE_API #include <nsIDocShell.h> #include <nsIDOMEventReceiver.h> @@ -82,7 +78,7 @@ public: nsresult DoCommand (const char *command); nsresult GetCommandState (const char *command, PRBool *enabled); - nsresult SetZoom (float aTextZoom, PRBool reflow); + nsresult SetZoom (float aTextZoom); nsresult GetZoom (float *aTextZoom); nsresult Print (nsIPrintSettings *options, PRBool preview); @@ -101,7 +97,7 @@ public: nsresult GetSHInfo (PRInt32 *count, PRInt32 *index); nsresult GetSHTitleAtIndex (PRInt32 index, PRUnichar **title); - nsresult GetSHUrlAtIndex (PRInt32 index, nsCString &url); + nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url); nsresult GoToHistoryIndex (PRInt16 index); nsresult ForceEncoding (const char *encoding); @@ -113,8 +109,8 @@ public: nsresult GetDocument (nsIDOMDocument **aDOMDocument); nsresult GetTargetDocument (nsIDOMDocument **aDOMDocument); - nsresult GetDocumentUrl (nsCString &url); - nsresult GetTargetDocumentUrl (nsCString &url); + nsresult GetDocumentUrl (nsACString &url); + nsresult GetTargetDocumentUrl (nsACString &url); nsresult GetHasModifiedForms (PRBool *modified); @@ -130,10 +126,10 @@ private: nsresult GetListener (void); nsresult AttachListeners (void); nsresult DetachListeners (void); - nsresult SetZoomOnDocshell (float aZoom, nsIDocShell *DocShell); nsresult GetSHistory (nsISHistory **aSHistory); nsresult GetContentViewer (nsIContentViewer **aViewer); nsresult GetDocumentHasModifiedForms (nsIDOMDocument *aDomDoc, PRUint32 *aNumTextFields, PRBool *aHasTextArea); + PRBool CompareFormsText (nsAString &aDefaultText, nsAString &aUserText); }; #endif |