| Index: chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc
|
| diff --git a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc
|
| index 33a08df67b54f38f6813e8be753650c4cbc6e8d4..71120de48a36574fd43182191377245800e69397 100644
|
| --- a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc
|
| +++ b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc
|
| @@ -112,10 +112,13 @@ void FaviconBitmapHandler::DownloadFavicon(const GURL& image_url) {
|
| FaviconUtil::DownloadFavicon(host, image_url, image_size);
|
| }
|
|
|
| -void FaviconBitmapHandler::OnDidDownloadFavicon(int id,
|
| - const GURL& image_url,
|
| - bool errored,
|
| - const SkBitmap& bitmap) {
|
| +
|
| +void FaviconBitmapHandler::OnDidDownloadFavicon(
|
| + int id,
|
| + const GURL& image_url,
|
| + bool errored,
|
| + int requested_size,
|
| + const std::vector<SkBitmap>& bitmaps) {
|
| UrlSet::iterator iter = pending_requests_.find(image_url);
|
| if (iter == pending_requests_.end()) {
|
| // Updates are received for all downloads; ignore unrequested urls.
|
| @@ -123,8 +126,9 @@ void FaviconBitmapHandler::OnDidDownloadFavicon(int id,
|
| }
|
| pending_requests_.erase(iter);
|
|
|
| - if (!errored)
|
| - AddFavicon(image_url, bitmap);
|
| + // Favicon bitmaps are ordered by decreasing width.
|
| + if (!errored && !bitmaps.empty())
|
| + AddFavicon(image_url, bitmaps[0]);
|
| }
|
|
|
| void FaviconBitmapHandler::AddFavicon(const GURL& image_url,
|
|
|