зеркало из https://github.com/mozilla/gecko-dev.git
Fixing Firebird build bustage after timeless' fishy checkin to bug 58613.
This commit is contained in:
Родитель
e5aa92e533
Коммит
06645ab757
|
@ -81,7 +81,7 @@ interface nsIBrowserHistory : nsISupports
|
|||
* lastPageVisited
|
||||
* the most recently visited page
|
||||
*/
|
||||
readonly attribute string lastPageVisited;
|
||||
attribute string lastPageVisited;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -107,7 +107,6 @@ nsIPrefBranch* nsGlobalHistory::gPrefBranch = nsnull;
|
|||
|
||||
#define PREF_BRANCH_BASE "browser."
|
||||
#define PREF_BROWSER_HISTORY_EXPIRE_DAYS "history_expire_days"
|
||||
#define PREF_BROWSER_STARTUP_PAGE "startup.page"
|
||||
#define PREF_AUTOCOMPLETE_ONLY_TYPED "urlbar.matchOnlyTyped"
|
||||
#define PREF_AUTOCOMPLETE_ENABLED "urlbar.autocomplete.enabled"
|
||||
|
||||
|
@ -615,15 +614,6 @@ nsGlobalHistory::AddPage(const char *aURL)
|
|||
nsresult rv = AddPageToDatabase(aURL, GetNow());
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
if (gPrefBranch) {
|
||||
PRInt32 choice = 0;
|
||||
gPrefBranch->GetIntPref(PREF_BROWSER_STARTUP_PAGE, &choice);
|
||||
if (choice == 2) {
|
||||
rv = SaveLastPageVisited(aURL);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -1190,8 +1180,8 @@ nsGlobalHistory::IsVisited(const char *aURL, PRBool *_retval)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsGlobalHistory::SaveLastPageVisited(const char *aURL)
|
||||
NS_IMETHODIMP
|
||||
nsGlobalHistory::SetLastPageVisited(const char *aURL)
|
||||
{
|
||||
NS_ENSURE_TRUE(aURL, NS_ERROR_FAILURE);
|
||||
NS_ENSURE_STATE(mMetaRow);
|
||||
|
|
|
@ -332,7 +332,6 @@ protected:
|
|||
// misc unrelated stuff
|
||||
//
|
||||
nsCOMPtr<nsIStringBundle> mBundle;
|
||||
nsresult SaveLastPageVisited(const char *);
|
||||
|
||||
// pseudo-constants. although the global history really is a
|
||||
// singleton, we'll use this metaphor to be consistent.
|
||||
|
|
Загрузка…
Ссылка в новой задаче