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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_favicon_loader.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_tab_helper.cc ('k') | chrome/browser/ui/extensions/shell_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
index 19690416ccde54fc423149c8ee7b8a702ef79bce..9648ea39902648920612650829124165e345a8e1 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
@@ -48,7 +48,6 @@ class FaviconBitmapHandler : public content::WebContentsObserver {
void DidDownloadFavicon(
int id,
const GURL& image_url,
- bool errored,
int requested_size,
const std::vector<SkBitmap>& bitmaps);
@@ -123,7 +122,6 @@ bool FaviconBitmapHandler::HasPendingDownloads() const {
void FaviconBitmapHandler::DidDownloadFavicon(
int id,
const GURL& image_url,
- bool errored,
int requested_size,
const std::vector<SkBitmap>& bitmaps) {
UrlSet::iterator iter = pending_requests_.find(image_url);
@@ -134,7 +132,7 @@ void FaviconBitmapHandler::DidDownloadFavicon(
pending_requests_.erase(iter);
// Favicon bitmaps are ordered by decreasing width.
- if (!errored && !bitmaps.empty())
+ if (!bitmaps.empty())
AddFavicon(image_url, bitmaps[0]);
}
« no previous file with comments | « chrome/browser/favicon/favicon_tab_helper.cc ('k') | chrome/browser/ui/extensions/shell_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698