diff options
author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 15:20:33 +0000 |
---|---|---|
committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 15:20:33 +0000 |
commit | f25387b62a3cccde48622d0b7fca57cd6fb16ab7 (patch) | |
tree | 06ac2c1972d6608fb65979c3a279a6d214fecc6c /chrome/browser/history/history_backend.h | |
parent | bcc682fc4f5050ac911635ab649fbd30002fc2b4 (diff) | |
download | chromium_src-f25387b62a3cccde48622d0b7fca57cd6fb16ab7.zip chromium_src-f25387b62a3cccde48622d0b7fca57cd6fb16ab7.tar.gz chromium_src-f25387b62a3cccde48622d0b7fca57cd6fb16ab7.tar.bz2 |
Moves bookmarks out of history into its own file (JSON).
Interesting points:
. Migration was a bit atypical. Here is the approach I took:
. If the URL db contains bookmarks it writes the bookmarks to a
temporary file.
. When the bookmark bar model is loaded it assumes bookmarks are
stored in a file. If the bookmarks file doesn't exist it then
attempts to load from history, after waiting for history to finish
processing tasks.
. I've broken having the omnibox query for starred only. This patch
was already too ginormous for me to contemplate this too. I'll return
to it after I land this.
. Similarly the history page isn't searching for starred titles
now. As we discussed with Glen, that is probably fine for now.
. I've converted NOTIFY_STARRED_FAVICON_CHANGED to
NOTIFY_FAVICON_CHANGED and it is notified ANY time a favicon
changes. I'm mildly concerned about the extra notifications, but
without having history know about starred it's the best I can do for
now.
. Autocomplete (specifically URLDatabase::AutocompleteForPrefix)
previously sorted by starred. It can no longer do this. I don't
think I can get this functionality back:( Luckily it only mattered
if you had a starred and non-starred URL with the same type count
that matched a query. Probably pretty rare.
What's left:
. Fix up HistoryContentsProvider to query for starred entries titles.
. Clean up the delete all case. I basically just made it compile; it
can be greatly simplified.
. Rename BookmarkBarModel to BookmarksModel.
BUG=1256202
TEST=this is a huge change to bookmarks. Thanfully it's pretty well
covered by tests, none-the-less make sure you exercise bookmarks
pretty heavily to make sure nothing is busted.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history_backend.h')
-rw-r--r-- | chrome/browser/history/history_backend.h | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index c1136de..f73e653 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -205,26 +205,6 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, void SetImportedFavicons( const std::vector<ImportedFavIconUsage>& favicon_usage); - // Starring ------------------------------------------------------------------ - - void GetAllStarredEntries( - scoped_refptr<GetStarredEntriesRequest> request); - - void UpdateStarredEntry(const StarredEntry& new_entry); - - void CreateStarredEntry(scoped_refptr<CreateStarredEntryRequest> request, - const StarredEntry& entry); - - void DeleteStarredGroup(UIStarID group_id); - - void DeleteStarredURL(const GURL& url); - - void DeleteStarredEntry(history::StarID star_id); - - void GetMostRecentStarredEntries( - scoped_refptr<GetMostRecentStarredEntriesRequest> request, - int max_count); - // Downloads ----------------------------------------------------------------- void QueryDownloads(scoped_refptr<DownloadQueryRequest> request); @@ -263,6 +243,8 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, void ProcessDBTask(scoped_refptr<HistoryDBTaskRequest> request); + void ProcessEmptyRequest(scoped_refptr<EmptyHistoryRequest> request); + // Deleting ------------------------------------------------------------------ void DeleteURL(const GURL& url); @@ -338,15 +320,6 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, const QueryOptions& options, QueryResults* result); - // Queries the starred database for all URL entries whose title contains the - // specified text. This is called as necessary from QueryHistoryFTS. The - // matches will be added to the beginning of the result vector in no - // particular order. - void QueryStarredEntriesByText(URLQuerier* querier, - const std::wstring& text_query, - const QueryOptions& options, - QueryResults* results); - // Committing ---------------------------------------------------------------- // We always keep a transaction open on the history database so that multiple |