| 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);
|
| }
|
|
|