| Index: chrome/browser/history/history.cc
|
| diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
|
| index d74e8893a75cee16463dc90b446270d311d716b8..8fe018156ac42939e253aa2c4eccbf3fdf347e0c 100644
|
| --- a/chrome/browser/history/history.cc
|
| +++ b/chrome/browser/history/history.cc
|
| @@ -449,41 +449,46 @@ HistoryService::Handle HistoryService::GetPageThumbnail(
|
| }
|
|
|
| void HistoryService::GetFavicon(FaviconService::GetFaviconRequest* request,
|
| - const GURL& icon_url) {
|
| + const GURL& icon_url,
|
| + history::IconType icon_type) {
|
| Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavIcon, NULL, request,
|
| - icon_url, history::FAV_ICON);
|
| + icon_url, icon_type);
|
| }
|
|
|
| void HistoryService::UpdateFaviconMappingAndFetch(
|
| FaviconService::GetFaviconRequest* request,
|
| const GURL& page_url,
|
| - const GURL& icon_url) {
|
| + const GURL& icon_url,
|
| + history::IconType icon_type) {
|
| Schedule(PRIORITY_NORMAL, &HistoryBackend::UpdateFavIconMappingAndFetch, NULL,
|
| request, page_url, icon_url, history::FAV_ICON);
|
| }
|
|
|
| void HistoryService::GetFaviconForURL(
|
| FaviconService::GetFaviconRequest* request,
|
| - const GURL& page_url) {
|
| + const GURL& page_url,
|
| + int icon_types) {
|
| Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavIconForURL, NULL, request,
|
| - page_url, history::FAV_ICON);
|
| + page_url, icon_types);
|
| }
|
|
|
| void HistoryService::SetFavicon(const GURL& page_url,
|
| const GURL& icon_url,
|
| - const std::vector<unsigned char>& image_data) {
|
| + const std::vector<unsigned char>& image_data,
|
| + history::IconType icon_type) {
|
| if (!CanAddURL(page_url))
|
| return;
|
|
|
| ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetFavIcon,
|
| page_url, icon_url,
|
| scoped_refptr<RefCountedMemory>(new RefCountedBytes(image_data)),
|
| - history::FAV_ICON);
|
| + icon_type);
|
| }
|
|
|
| void HistoryService::SetFaviconOutOfDateForPage(const GURL& page_url) {
|
| ScheduleAndForget(PRIORITY_NORMAL,
|
| - &HistoryBackend::SetFavIconOutOfDateForPage, page_url);
|
| + &HistoryBackend::SetFavIconOutOfDateForPage,
|
| + page_url);
|
| }
|
|
|
| void HistoryService::SetImportedFavicons(
|
|
|