webui: Request favicons at all required display scale factors

chrome/browser/ui/webui/chrome_web_ui_controller_factory.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/webui/chrome_web_ui_controller_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ skipping 449 matching lines @@
 
   WebUIController* controller = (*function)(web_ui, url);
   if (controller)
     web_ui->AddMessageHandler(new GenericHandler());
   return controller;
 }
 
 void ChromeWebUIControllerFactory::GetFaviconForURL(
     Profile* profile,
     FaviconService::GetFaviconRequest* request,
-    const GURL& page_url) const {
+    const GURL& page_url,
+    const std::vector<ui::ScaleFactor>& scale_factors) const {
   // Before determining whether page_url is an extension url, we must handle
   // overrides. This changes urls in |kChromeUIScheme| to extension urls, and
   // allows to use ExtensionWebUI::GetFaviconForURL.
   GURL url(page_url);
   ExtensionWebUI::HandleChromeURLOverride(&url, profile);
 
   // All extensions but the bookmark manager get their favicon from the icons
   // part of the manifest.
   if (url.SchemeIs(chrome::kExtensionScheme) &&
       url.host() != extension_misc::kBookmarkManagerId) {
     ExtensionWebUI::GetFaviconForURL(profile, request, url);
   } else {
-    scoped_refptr<base::RefCountedMemory> bitmap(GetFaviconResourceBytes(
-          url, ui::SCALE_FACTOR_100P));
     std::vector<history::FaviconBitmapResult> favicon_bitmap_results;
-    if (bitmap.get() && bitmap->size()) {
-      history::FaviconBitmapResult bitmap_result;
-      bitmap_result.bitmap_data = bitmap;
-      bitmap_result.icon_type = history::FAVICON;
-      favicon_bitmap_results.push_back(bitmap_result);
+    for (size_t i = 0; i < scale_factors.size(); ++i) {
+      scoped_refptr<base::RefCountedMemory> bitmap(GetFaviconResourceBytes(
+            url, scale_factors[i]));
+      if (bitmap.get() && bitmap->size()) {
+        history::FaviconBitmapResult bitmap_result;
+        bitmap_result.bitmap_data = bitmap;
+        bitmap_result.icon_type = history::FAVICON;
+        favicon_bitmap_results.push_back(bitmap_result);
+      }
     }
     request->ForwardResultAsync(request->handle(), favicon_bitmap_results,
                                 history::IconURLSizesMap());
   }
 }
 
 // static
 ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
   return Singleton< ChromeWebUIControllerFactory, PossibleTestSingletonTraits<
       ChromeWebUIControllerFactory, TestChromeWebUIControllerFactory> >::get();
@@ skipping 48 matching lines @@
   if (page_url.host() == chrome::kChromeUISettingsFrameHost)
     return options::OptionsUI::GetFaviconResourceBytes(scale_factor);
 
   // Android doesn't use the plugins pages.
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes(scale_factor);
 #endif
 
   return NULL;
 }