Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: components/favicon/core/favicon_handler.h

Issue 1272413002: Remove useless FaviconHandler::PageChangedSinceFaviconWasRequested() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/favicon/core/favicon_driver_impl.cc ('k') | components/favicon/core/favicon_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4850f3c936d9d59cd7b8dd9d11aed289deec3e91 100644
--- a/components/favicon/core/favicon_handler.h
+++ b/components/favicon/core/favicon_handler.h
@@ -94,7 +94,8 @@ class FaviconHandler {
// Message Handler. Must be public, because also called from
// PrerenderContents. Collects the |image_urls| list.
- void OnUpdateFaviconURL(const std::vector<favicon::FaviconURL>& candidates);
+ void OnUpdateFaviconURL(const GURL& page_url,
+ const std::vector<favicon::FaviconURL>& candidates);
// Processes the current image_urls_ entry, requesting the image from the
// history / download service.
@@ -153,7 +154,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 +165,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 +176,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 +198,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 +207,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);
@@ -242,9 +234,6 @@ class FaviconHandler {
return (!image_urls_.empty()) ? &image_urls_.front() : NULL;
}
- // Returns whether the page's url changed since the favicon was requested.
- bool PageChangedSinceFaviconWasRequested();
-
// Returns the preferred size of the image. 0 means no preference (any size
// will do).
int preferred_icon_size() const {
« no previous file with comments | « components/favicon/core/favicon_driver_impl.cc ('k') | components/favicon/core/favicon_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698