Use hi-resolution favicon variants if available.

chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.h"
 
 #include "base/logging.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/common/favicon_url.h"
@@ skipping 25 matching lines @@
   ~FaviconBitmapHandler() {}
 
   const SkBitmap& bitmap() const { return bitmap_; }
 
   void OnUpdateFaviconURL(int32 page_id,
                           const std::vector<FaviconURL>& candidates);
 
   void OnDidDownloadFavicon(int id,
                             const GURL& image_url,
                             bool errored,
-                            const SkBitmap& bitmap);
+                            int requested_size,
+                            const std::vector<SkBitmap>& bitmaps);
 
  private:
   void DownloadFavicon(const GURL& image_url);
   void AddFavicon(const GURL& image_url, const SkBitmap& new_bitmap);
 
   content::WebContents* web_contents_;
   LauncherFaviconLoader::Delegate* delegate_;
 
   typedef std::set<GURL> UrlSet;
   // Map of pending download urls.
@@ skipping 48 matching lines @@
   }
 }
 
 void FaviconBitmapHandler::DownloadFavicon(const GURL& image_url) {
   int image_size = 0;  // Request the full sized image.
   pending_requests_.insert(image_url);
   content::RenderViewHost* host = web_contents_->GetRenderViewHost();
   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.
     return;
   }
   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,
                                       const SkBitmap& new_bitmap) {
   processed_requests_.insert(image_url);
   if (new_bitmap.height() > kMaxBitmapSize ||
       new_bitmap.width() > kMaxBitmapSize)
     return;
   if (new_bitmap.height() < ash::kLauncherPreferredSize)
     return;
@@ skipping 34 matching lines @@
 SkBitmap LauncherFaviconLoader::GetFavicon() const {
   return favicon_handler_->bitmap();
 }
 
 void LauncherFaviconLoader::OnUpdateFaviconURL(
     int32 page_id,
     const std::vector<FaviconURL>& candidates) {
   favicon_handler_->OnUpdateFaviconURL(page_id, candidates);
 }
 
-void LauncherFaviconLoader::OnDidDownloadFavicon(int id,
-                                                 const GURL& image_url,
-                                                 bool errored,
-                                                 const SkBitmap& bitmap) {
-  favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, bitmap);
+void LauncherFaviconLoader::OnDidDownloadFavicon(
+    int id,
+    const GURL& image_url,
+    bool errored,
+    int requested_size,
+    const std::vector<SkBitmap>& bitmaps) {
+  favicon_handler_->OnDidDownloadFavicon(
+      id, image_url, errored, requested_size, bitmaps);
 }