зеркало из https://github.com/mozilla/gecko-dev.git
Bug 319228 r=bryner Options cleanup, custom titles for sites.
Original committer: brettw%gmail.com Original revision: 1.32 Original date: 2005/12/15 03:56:49
This commit is contained in:
Родитель
66a69f6711
Коммит
31a1746c19
|
@ -122,7 +122,9 @@ class nsNavHistoryQueryOptions : public nsINavHistoryQueryOptions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
nsNavHistoryQueryOptions() : mSort(0), mResultType(0),
|
nsNavHistoryQueryOptions() : mSort(0), mResultType(0),
|
||||||
mGroupCount(0), mGroupings(nsnull), mExpandPlaces(PR_FALSE)
|
mGroupCount(0), mGroupings(nsnull),
|
||||||
|
mExpandPlaces(PR_FALSE),
|
||||||
|
mForceOriginalTitle(PR_FALSE)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_NAVHISTORYQUERYOPTIONS_IID)
|
NS_DECLARE_STATIC_IID_ACCESSOR(NS_NAVHISTORYQUERYOPTIONS_IID)
|
||||||
|
@ -136,6 +138,7 @@ public:
|
||||||
*count = mGroupCount; return mGroupings;
|
*count = mGroupCount; return mGroupings;
|
||||||
}
|
}
|
||||||
PRBool ExpandPlaces() const { return mExpandPlaces; }
|
PRBool ExpandPlaces() const { return mExpandPlaces; }
|
||||||
|
PRBool ForceOriginalTitle() const { return mForceOriginalTitle; }
|
||||||
|
|
||||||
nsresult Clone(nsNavHistoryQueryOptions **aResult);
|
nsresult Clone(nsNavHistoryQueryOptions **aResult);
|
||||||
|
|
||||||
|
@ -149,6 +152,7 @@ private:
|
||||||
PRUint32 mGroupCount;
|
PRUint32 mGroupCount;
|
||||||
PRInt32 *mGroupings;
|
PRInt32 *mGroupings;
|
||||||
PRBool mExpandPlaces;
|
PRBool mExpandPlaces;
|
||||||
|
PRBool mForceOriginalTitle;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -500,6 +504,7 @@ public:
|
||||||
static const PRInt32 kGetInfoIndex_PageID;
|
static const PRInt32 kGetInfoIndex_PageID;
|
||||||
static const PRInt32 kGetInfoIndex_URL;
|
static const PRInt32 kGetInfoIndex_URL;
|
||||||
static const PRInt32 kGetInfoIndex_Title;
|
static const PRInt32 kGetInfoIndex_Title;
|
||||||
|
static const PRInt32 kGetInfoIndex_UserTitle;
|
||||||
static const PRInt32 kGetInfoIndex_RevHost;
|
static const PRInt32 kGetInfoIndex_RevHost;
|
||||||
static const PRInt32 kGetInfoIndex_VisitCount;
|
static const PRInt32 kGetInfoIndex_VisitCount;
|
||||||
|
|
||||||
|
@ -521,13 +526,15 @@ public:
|
||||||
|
|
||||||
// Take a row of kGetInfoIndex_* columns and construct a ResultNode.
|
// Take a row of kGetInfoIndex_* columns and construct a ResultNode.
|
||||||
// The row must contain the full set of columns.
|
// The row must contain the full set of columns.
|
||||||
nsresult RowToResult(mozIStorageValueArray* aRow, PRBool aAsVisits,
|
nsresult RowToResult(mozIStorageValueArray* aRow,
|
||||||
|
nsNavHistoryQueryOptions* aOptions,
|
||||||
nsNavHistoryResultNode** aResult);
|
nsNavHistoryResultNode** aResult);
|
||||||
|
|
||||||
// Take a row of kGetInfoIndex_* columns and fill in an existing ResultNode.
|
// Take a row of kGetInfoIndex_* columns and fill in an existing ResultNode.
|
||||||
// The node's type must already be set, and the row must contain the full
|
// The node's type must already be set, and the row must contain the full
|
||||||
// set of columns.
|
// set of columns.
|
||||||
nsresult FillURLResult(mozIStorageValueArray* aRow,
|
nsresult FillURLResult(mozIStorageValueArray* aRow,
|
||||||
|
nsNavHistoryQueryOptions* aOptions,
|
||||||
nsNavHistoryResultNode *aNode);
|
nsNavHistoryResultNode *aNode);
|
||||||
|
|
||||||
// Construct a new HistoryResult object. You can give it null query/options.
|
// Construct a new HistoryResult object. You can give it null query/options.
|
||||||
|
@ -549,7 +556,6 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
// well-known annotations used by the history and bookmarks systems
|
// well-known annotations used by the history and bookmarks systems
|
||||||
static const char kAnnotationTitle[];
|
|
||||||
static const char kAnnotationPreviousEncoding[];
|
static const char kAnnotationPreviousEncoding[];
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -581,6 +587,7 @@ protected:
|
||||||
nsCOMPtr<mozIStorageStatement> mDBFullAutoComplete; // kAutoCompleteIndex_* results, 1 arg (max # results)
|
nsCOMPtr<mozIStorageStatement> mDBFullAutoComplete; // kAutoCompleteIndex_* results, 1 arg (max # results)
|
||||||
static const PRInt32 kAutoCompleteIndex_URL;
|
static const PRInt32 kAutoCompleteIndex_URL;
|
||||||
static const PRInt32 kAutoCompleteIndex_Title;
|
static const PRInt32 kAutoCompleteIndex_Title;
|
||||||
|
static const PRInt32 kAutoCompleteIndex_UserTitle;
|
||||||
static const PRInt32 kAutoCompleteIndex_VisitCount;
|
static const PRInt32 kAutoCompleteIndex_VisitCount;
|
||||||
static const PRInt32 kAutoCompleteIndex_Typed;
|
static const PRInt32 kAutoCompleteIndex_Typed;
|
||||||
|
|
||||||
|
@ -626,7 +633,8 @@ protected:
|
||||||
nsINavHistoryQuery* aQuery,
|
nsINavHistoryQuery* aQuery,
|
||||||
PRInt32* aParamCount);
|
PRInt32* aParamCount);
|
||||||
|
|
||||||
nsresult ResultsAsList(mozIStorageStatement* statement, PRBool aAsVisits,
|
nsresult ResultsAsList(mozIStorageStatement* statement,
|
||||||
|
nsNavHistoryQueryOptions* aOptions,
|
||||||
nsCOMArray<nsNavHistoryResultNode>* aResults);
|
nsCOMArray<nsNavHistoryResultNode>* aResults);
|
||||||
|
|
||||||
void TitleForDomain(const nsString& domain, nsAString& aTitle);
|
void TitleForDomain(const nsString& domain, nsAString& aTitle);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче