Index: components/history/core/browser/history_backend.h |
diff --git a/components/history/core/browser/history_backend.h b/components/history/core/browser/history_backend.h |
index f96d2182c87b8af64de5d9378c85a24f99beffbe..ee7e238cc8d8d5c3dad0fa4c4d75cfb15fd566a8 100644 |
--- a/components/history/core/browser/history_backend.h |
+++ b/components/history/core/browser/history_backend.h |
@@ -285,9 +285,9 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, |
// Favicon ------------------------------------------------------------------- |
- void GetFavicons( |
- const std::vector<GURL>& icon_urls, |
- int icon_types, |
+ void GetFavicon( |
+ const GURL& icon_url, |
+ favicon_base::IconType icon_type, |
const std::vector<int>& desired_sizes, |
std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results); |
@@ -310,8 +310,8 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, |
void UpdateFaviconMappingsAndFetch( |
const GURL& page_url, |
- const std::vector<GURL>& icon_urls, |
- int icon_types, |
+ const GURL& icon_url, |
+ favicon_base::IconType icon_type, |
const std::vector<int>& desired_sizes, |
std::vector<favicon_base::FaviconRawBitmapResult>* bitmap_results); |
@@ -684,18 +684,14 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>, |
const std::vector<SkBitmap>& bitmaps, |
bool bitmaps_are_expired); |
- // Used by both UpdateFaviconMappingsAndFetch and GetFavicons. |
- // If |page_url| is non-null, the icon urls for |page_url| (and all |
- // redirects) are set to the subset of |icon_urls| for which icons are |
- // already stored in the database. |
- // If |page_url| is non-null, |icon_types| can be multiple icon types |
- // only if |icon_types| == TOUCH_ICON | TOUCH_PRECOMPOSED_ICON. |
- // If multiple icon types are specified, |page_url| will be mapped to the |
- // icon URLs of the largest type available in the database. |
+ // Used by both UpdateFaviconMappingsAndFetch() and GetFavicon(). |
+ // If |page_url| is non-null and there is a favicon stored in the database |
+ // for |icon_url|, a mapping is added to the database from |page_url| (and all |
+ // redirects) to |icon_url|. |
void UpdateFaviconMappingsAndFetchImpl( |
const GURL* page_url, |
- const std::vector<GURL>& icon_urls, |
- int icon_types, |
+ const GURL& icon_url, |
+ favicon_base::IconType icon_type, |
const std::vector<int>& desired_sizes, |
std::vector<favicon_base::FaviconRawBitmapResult>* results); |