Index: components/favicon/core/favicon_handler.h |
diff --git a/components/favicon/core/favicon_handler.h b/components/favicon/core/favicon_handler.h |
index 3fee8be7cb933e757619127df7b7830695c3e6d1..120253624204e3ec1fe51d04b9f2323007773d49 100644 |
--- a/components/favicon/core/favicon_handler.h |
+++ b/components/favicon/core/favicon_handler.h |
@@ -153,7 +153,7 @@ class FaviconHandler { |
const gfx::Image& image); |
// Returns true if the favicon should be saved. |
- virtual bool ShouldSaveFavicon(const GURL& url); |
+ virtual bool ShouldSaveFavicon(); |
private: |
// For testing: |
@@ -164,11 +164,8 @@ class FaviconHandler { |
DownloadRequest(); |
~DownloadRequest(); |
- DownloadRequest(const GURL& url, |
- const GURL& image_url, |
- favicon_base::IconType icon_type); |
+ DownloadRequest(const GURL& image_url, favicon_base::IconType icon_type); |
- GURL url; |
GURL image_url; |
favicon_base::IconType icon_type; |
}; |
@@ -178,13 +175,11 @@ class FaviconHandler { |
FaviconCandidate(); |
~FaviconCandidate(); |
- FaviconCandidate(const GURL& url, |
- const GURL& image_url, |
+ FaviconCandidate(const GURL& image_url, |
const gfx::Image& image, |
float score, |
favicon_base::IconType icon_type); |
- GURL url; |
GURL image_url; |
gfx::Image image; |
float score; |
@@ -202,8 +197,7 @@ class FaviconHandler { |
// If the favicon has expired, asks the renderer to download the favicon. |
// Otherwise asks history to update the mapping between page url and icon |
// url with a callback to OnFaviconData when done. |
- void DownloadFaviconOrAskFaviconService(const GURL& page_url, |
- const GURL& icon_url, |
+ void DownloadFaviconOrAskFaviconService(const GURL& icon_url, |
favicon_base::IconType icon_type); |
// See description above class for details. |
@@ -212,20 +206,17 @@ class FaviconHandler { |
// Schedules a download for the specified entry. This adds the request to |
// download_requests_. |
- void ScheduleDownload(const GURL& url, |
- const GURL& image_url, |
+ void ScheduleDownload(const GURL& image_url, |
favicon_base::IconType icon_type); |
// Updates |favicon_candidate_| and returns true if it is an exact match. |
- bool UpdateFaviconCandidate(const GURL& url, |
- const GURL& image_url, |
+ bool UpdateFaviconCandidate(const GURL& image_url, |
const gfx::Image& image, |
float score, |
favicon_base::IconType icon_type); |
// Sets the image data for the favicon. |
- void SetFavicon(const GURL& url, |
- const GURL& icon_url, |
+ void SetFavicon(const GURL& icon_url, |
const gfx::Image& image, |
favicon_base::IconType icon_type); |