diff --git a/docshell/shistory/nsSHistory.cpp b/docshell/shistory/nsSHistory.cpp index d362173c9be1..d36a7582fdb4 100644 --- a/docshell/shistory/nsSHistory.cpp +++ b/docshell/shistory/nsSHistory.cpp @@ -588,7 +588,7 @@ nsSHistory::GetEntryAtIndex(int32_t aIndex, bool aModifyIndex, } /* Get the transaction at a given index */ -NS_IMETHODIMP +nsresult nsSHistory::GetTransactionAtIndex(int32_t aIndex, nsISHTransaction** aResult) { nsresult rv; @@ -1703,7 +1703,7 @@ nsSHistory::LoadNextPossibleEntry(int32_t aNewIndex, long aLoadType, return NS_ERROR_FAILURE; } -NS_IMETHODIMP +nsresult nsSHistory::LoadEntry(int32_t aIndex, long aLoadType, uint32_t aHistCmd) { if (!mRootDocShell) { diff --git a/docshell/shistory/nsSHistory.h b/docshell/shistory/nsSHistory.h index 2cee92d7bd15..a8933ad17763 100644 --- a/docshell/shistory/nsSHistory.h +++ b/docshell/shistory/nsSHistory.h @@ -83,15 +83,14 @@ private: friend class nsSHEnumerator; friend class nsSHistoryObserver; - // Could become part of nsIWebNavigation - NS_IMETHOD GetTransactionAtIndex(int32_t aIndex, nsISHTransaction** aResult); + nsresult GetTransactionAtIndex(int32_t aIndex, nsISHTransaction** aResult); nsresult LoadDifferingEntries(nsISHEntry* aPrevEntry, nsISHEntry* aNextEntry, nsIDocShell* aRootDocShell, long aLoadType, bool& aDifferenceFound); nsresult InitiateLoad(nsISHEntry* aFrameEntry, nsIDocShell* aFrameDS, long aLoadType); - NS_IMETHOD LoadEntry(int32_t aIndex, long aLoadType, uint32_t aHistCmd); + nsresult LoadEntry(int32_t aIndex, long aLoadType, uint32_t aHistCmd); #ifdef DEBUG nsresult PrintHistory();