mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-05 15:59:45 +00:00
Bug 402753 remove post-sql options checks from nsNavHistory::IsHistoryMenuQuery (r=sspitzer, a=drivers)
This commit is contained in:
parent
1e18e8c52a
commit
77fcd5046f
@ -2131,36 +2131,9 @@ PRBool IsHistoryMenuQuery(const nsCOMArray<nsNavHistoryQuery>& aQueries, nsNavHi
|
|||||||
if (aOptions->ExcludeItems())
|
if (aOptions->ExcludeItems())
|
||||||
return PR_FALSE;
|
return PR_FALSE;
|
||||||
|
|
||||||
if (aOptions->ExcludeQueries())
|
|
||||||
return PR_FALSE;
|
|
||||||
|
|
||||||
if (aOptions->ExcludeReadOnlyFolders())
|
|
||||||
return PR_FALSE;
|
|
||||||
|
|
||||||
if (aOptions->IncludeHidden())
|
if (aOptions->IncludeHidden())
|
||||||
return PR_FALSE;
|
return PR_FALSE;
|
||||||
|
|
||||||
if (aOptions->ShowSessions())
|
|
||||||
return PR_FALSE;
|
|
||||||
|
|
||||||
if (aOptions->ResolveNullBookmarkTitles())
|
|
||||||
return PR_FALSE;
|
|
||||||
|
|
||||||
if (aOptions->ApplyOptionsToContainers())
|
|
||||||
return PR_FALSE;
|
|
||||||
|
|
||||||
nsCString sortingAnnotation;
|
|
||||||
nsresult rv = aOptions->GetSortingAnnotation(sortingAnnotation);
|
|
||||||
NS_ENSURE_SUCCESS(rv, PR_FALSE);
|
|
||||||
if (!sortingAnnotation.IsEmpty())
|
|
||||||
return PR_FALSE;
|
|
||||||
|
|
||||||
nsCString parentAnnotationToExclude;
|
|
||||||
rv = aOptions->GetExcludeItemIfParentHasAnnotation(parentAnnotationToExclude);
|
|
||||||
NS_ENSURE_SUCCESS(rv, PR_FALSE);
|
|
||||||
if (!parentAnnotationToExclude.IsEmpty())
|
|
||||||
return PR_FALSE;
|
|
||||||
|
|
||||||
if (aQuery->MinVisits() != -1 || aQuery->MaxVisits() != -1)
|
if (aQuery->MinVisits() != -1 || aQuery->MaxVisits() != -1)
|
||||||
return PR_FALSE;
|
return PR_FALSE;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user