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

Unified Diff: chrome/browser/favicon/favicon_handler.cc

Issue 11777009: Remove redundant |errored| member from IconHostMsg_DidDownloadFavicon (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « chrome/browser/favicon/favicon_handler.h ('k') | chrome/browser/favicon/favicon_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/favicon_handler.cc
diff --git a/chrome/browser/favicon/favicon_handler.cc b/chrome/browser/favicon/favicon_handler.cc
index 36c0eb31538a67ba3637c15ad01d1e4cbcf7dd64..9c479fb3e1cf06ca988a3d85b477f8cc9d9537db 100644
--- a/chrome/browser/favicon/favicon_handler.cc
+++ b/chrome/browser/favicon/favicon_handler.cc
@@ -370,7 +370,6 @@ void FaviconHandler::ProcessCurrentUrl() {
void FaviconHandler::OnDidDownloadFavicon(
int id,
const GURL& image_url,
- bool errored,
int requested_size,
const std::vector<SkBitmap>& bitmaps) {
DownloadRequests::iterator i = download_requests_.find(id);
@@ -391,7 +390,7 @@ void FaviconHandler::OnDidDownloadFavicon(
// The downloaded icon is still valid when there is no FaviconURL update
// during the downloading.
bool request_next_icon = true;
- if (!errored) {
+ if (!bitmaps.empty()) {
request_next_icon = !UpdateFaviconCandidate(
i->second.url, image_url, image, score, i->second.icon_type);
}
« no previous file with comments | « chrome/browser/favicon/favicon_handler.h ('k') | chrome/browser/favicon/favicon_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698