diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 16:19:24 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 16:19:24 +0000 |
| commit | 5f104d769c8c1302eaffec131d201eae8849570f (patch) | |
| tree | 8775de80988147495a6dd8654fbdf0bb854daccd /chrome/browser/history/history.cc | |
| parent | 59c50a33c4961750f3d47cce47f67f243527390d (diff) | |
| download | chromium_src-5f104d769c8c1302eaffec131d201eae8849570f.zip chromium_src-5f104d769c8c1302eaffec131d201eae8849570f.tar.gz chromium_src-5f104d769c8c1302eaffec131d201eae8849570f.tar.bz2 | |
Lands http://code.google.com/p/chromium/issues/detail?id=71571 for
Moved the page and icon mapping from URLDatabase to
ThumbnailDatabase.
a. Created a new table icon_mappings in ThumbnailDatabase.
b. Migrated the mapping data during the upgrade.
c. Provided the new interface to access the icon_mapping data.
d. Removed the API to access the faviconID field in url database.
Support IconType.
a. Added additional column icon_type in favicons table.
b. Provided the APIs to access the icon_type field.
c. Currently hard-code all icon_type as FAV_ICON in history backend.
BUG=71571
TEST=new testcases in thumbnail_database_unittest.cc, and the existent
tests in history_backend_unittest.cc, history_unitest.cc,
bookmark_html_writer_unittest.cc etc.
Review URL: http://codereview.chromium.org/6620001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history.cc')
| -rw-r--r-- | chrome/browser/history/history.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index 4bbf6a8..d74e889 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -451,7 +451,7 @@ HistoryService::Handle HistoryService::GetPageThumbnail( void HistoryService::GetFavicon(FaviconService::GetFaviconRequest* request, const GURL& icon_url) { Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavIcon, NULL, request, - icon_url); + icon_url, history::FAV_ICON); } void HistoryService::UpdateFaviconMappingAndFetch( @@ -459,14 +459,14 @@ void HistoryService::UpdateFaviconMappingAndFetch( const GURL& page_url, const GURL& icon_url) { Schedule(PRIORITY_NORMAL, &HistoryBackend::UpdateFavIconMappingAndFetch, NULL, - request, page_url, icon_url); + request, page_url, icon_url, history::FAV_ICON); } void HistoryService::GetFaviconForURL( FaviconService::GetFaviconRequest* request, const GURL& page_url) { Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavIconForURL, NULL, request, - page_url); + page_url, history::FAV_ICON); } void HistoryService::SetFavicon(const GURL& page_url, @@ -477,7 +477,8 @@ void HistoryService::SetFavicon(const GURL& page_url, ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetFavIcon, page_url, icon_url, - scoped_refptr<RefCountedMemory>(new RefCountedBytes(image_data))); + scoped_refptr<RefCountedMemory>(new RefCountedBytes(image_data)), + history::FAV_ICON); } void HistoryService::SetFaviconOutOfDateForPage(const GURL& page_url) { |