diff options
| author | arv@google.com <arv@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:56:48 +0000 |
|---|---|---|
| committer | arv@google.com <arv@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 21:56:48 +0000 |
| commit | 0189bc72c90fab03afab623d0b2d8be3d35af3e7 (patch) | |
| tree | a1962c2ecddcaf1eb1f1a27f6dde6991d19a9b07 /chrome/browser/fav_icon_helper.h | |
| parent | 34a6418e00deca16a311b331ab4b2f257c674d74 (diff) | |
| download | chromium_src-0189bc72c90fab03afab623d0b2d8be3d35af3e7.zip chromium_src-0189bc72c90fab03afab623d0b2d8be3d35af3e7.tar.gz chromium_src-0189bc72c90fab03afab623d0b2d8be3d35af3e7.tar.bz2 | |
Adds a FaviconService class tied to the profile.
Original issue: http://codereview.chromium.org/115212/show
The favicons service is the entry point to getting favicons.
Make the DOMUIFactory handle the favicons of DOMUI pages so since DOMUI pages
are never added to the history.
BUG=5840
TEST=Open a new window and open history and downloads (Ctrl+H and Ctrl+J) in
this window. Then close the window and open the NTP. The recently closed
windows/tabs should show the favicons for the hsitroy and downloads page.
Review URL: http://codereview.chromium.org/178001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/fav_icon_helper.h')
| -rw-r--r-- | chrome/browser/fav_icon_helper.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/fav_icon_helper.h b/chrome/browser/fav_icon_helper.h index adbcaf0..b2d53ee 100644 --- a/chrome/browser/fav_icon_helper.h +++ b/chrome/browser/fav_icon_helper.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "chrome/browser/cancelable_request.h" -#include "chrome/browser/history/history.h" +#include "chrome/browser/favicon_service.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/common/ref_counted_util.h" #include "googleurl/src/gurl.h" @@ -23,7 +23,8 @@ class TabContents; // FavIconHelper is used to fetch the favicon for TabContents. // -// FetchFavIcon requests the favicon from the history database. At this point +// FetchFavIcon requests the favicon from the favicon service which in turn +// requests the favicon from the history database. At this point // we only know the URL of the page, and not necessarily the url of the // favicon. To ensure we handle reloading stale favicons as well as // reloading a favicon on page reload we always request the favicon from @@ -113,10 +114,10 @@ class FavIconHelper : public RenderViewHostDelegate::FavIcon { Profile* profile(); - HistoryService* GetHistoryService(); + FaviconService* GetFaviconService(); // See description above class for details. - void OnFavIconDataForInitialURL(HistoryService::Handle handle, + void OnFavIconDataForInitialURL(FaviconService::Handle handle, bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, @@ -128,7 +129,7 @@ class FavIconHelper : public RenderViewHostDelegate::FavIcon { void DownloadFavIconOrAskHistory(NavigationEntry* entry); // See description above class for details. - void OnFavIconData(HistoryService::Handle handle, + void OnFavIconData(FaviconService::Handle handle, bool know_favicon, scoped_refptr<RefCountedBytes> data, bool expired, |