зеркало из https://github.com/mozilla/gecko-dev.git
Bug 664979 - Merge nsISHistory_2_0_BRANCH into nsISHistory; r=bz
This commit is contained in:
Родитель
1fb9ad57f8
Коммит
79970c2a33
|
@ -2904,7 +2904,7 @@ SessionStoreService.prototype = {
|
|||
// instead of gotoIndex. See bug 597315.
|
||||
browser.webNavigation.sessionHistory.getEntryAtIndex(activeIndex, true);
|
||||
browser.webNavigation.sessionHistory.
|
||||
QueryInterface(Ci.nsISHistory_2_0_BRANCH).reloadCurrentEntry();
|
||||
QueryInterface(Ci.nsISHistory).reloadCurrentEntry();
|
||||
}
|
||||
catch (ex) {
|
||||
// ignore page load errors
|
||||
|
|
|
@ -60,7 +60,7 @@ interface nsISimpleEnumerator;
|
|||
#define NS_SHISTORY_CONTRACTID "@mozilla.org/browser/shistory;1"
|
||||
%}
|
||||
|
||||
[scriptable, uuid(9883609F-CDD8-4d83-9B55-868FF08AD433)]
|
||||
[scriptable, uuid(ef2c9bcb-96b8-4095-933a-cb1c506f2c58)]
|
||||
interface nsISHistory: nsISupports
|
||||
{
|
||||
/**
|
||||
|
@ -177,10 +177,6 @@ interface nsISHistory: nsISupports
|
|||
* @see do_QueryInterface()
|
||||
*/
|
||||
readonly attribute nsISimpleEnumerator SHistoryEnumerator;
|
||||
};
|
||||
|
||||
[scriptable, uuid(ac8b3eb3-2051-4cce-8303-d6e7938501dd)]
|
||||
interface nsISHistory_2_0_BRANCH: nsISHistory
|
||||
{
|
||||
void reloadCurrentEntry();
|
||||
void reloadCurrentEntry();
|
||||
};
|
||||
|
|
|
@ -164,7 +164,6 @@ NS_INTERFACE_MAP_BEGIN(nsSHistory)
|
|||
NS_INTERFACE_MAP_ENTRY(nsISHistory)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIWebNavigation)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISHistoryInternal)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISHistory_2_0_BRANCH)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
//*****************************************************************************
|
||||
|
|
|
@ -62,7 +62,7 @@ class nsIDocShell;
|
|||
class nsSHEnumerator;
|
||||
class nsSHistoryObserver;
|
||||
class nsSHistory: public PRCList,
|
||||
public nsISHistory_2_0_BRANCH,
|
||||
public nsISHistory,
|
||||
public nsISHistoryInternal,
|
||||
public nsIWebNavigation
|
||||
{
|
||||
|
@ -73,7 +73,6 @@ public:
|
|||
NS_DECL_NSISHISTORY
|
||||
NS_DECL_NSISHISTORYINTERNAL
|
||||
NS_DECL_NSIWEBNAVIGATION
|
||||
NS_DECL_NSISHISTORY_2_0_BRANCH
|
||||
|
||||
// One time initialization method called upon docshell module construction
|
||||
static nsresult Startup();
|
||||
|
|
Загрузка…
Ссылка в новой задаче