Use hi-resolution favicon variants if available.

chrome/browser/favicon/favicon_tab_helper.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/favicon/favicon_tab_helper.h"
 
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_util.h"
+#include "chrome/browser/favicon/select_favicon_frames.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
 
 using content::FaviconStatus;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 FaviconTabHelper::FaviconTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())) {
   favicon_handler_.reset(new FaviconHandler(profile_, this,
@@ skipping 142 matching lines @@
 bool FaviconTabHelper::OnMessageReceived(const IPC::Message& message) {
   bool message_handled = false;   // Allow other handlers to receive these.
   IPC_BEGIN_MESSAGE_MAP(FaviconTabHelper, message)
     IPC_MESSAGE_HANDLER(IconHostMsg_DidDownloadFavicon, OnDidDownloadFavicon)
     IPC_MESSAGE_HANDLER(IconHostMsg_UpdateFaviconURL, OnUpdateFaviconURL)
     IPC_MESSAGE_UNHANDLED(message_handled = false)
   IPC_END_MESSAGE_MAP()
   return message_handled;
 }
 
-void FaviconTabHelper::OnDidDownloadFavicon(int id,
-                                            const GURL& image_url,
-                                            bool errored,
-                                            const SkBitmap& image) {
-  gfx::Image favicon(image);
+void FaviconTabHelper::OnDidDownloadFavicon(
+    int id,
+    const GURL& image_url,
+    bool errored,
+    int requested_size,
+    const std::vector<SkBitmap>& bitmaps) {
+  // TODO: Possibly do bitmap selection in FaviconHandler, so that it can score
+  // favicons better.
+  std::vector<ui::ScaleFactor> scale_factors;
+#if defined(OS_MACOSX)
+  scale_factors = ui::GetSupportedScaleFactors();
+#else
+  scale_factors.push_back(ui::SCALE_FACTOR_100P);  // TODO: Aura?

[Nico, 2012/08/06 20:29:19]

pkotwicz: How should this be done?

+#endif
+  gfx::Image favicon(SelectFaviconFrames(bitmaps, scale_factors, requested_size));

[sky, 2012/08/06 20:49:14]

nit: > 80

   favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
 }