Ensure that favicons always have 1x representation regardless of whether the platform supports it

chrome/browser/extensions/extension_web_ui.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/extensions/extension_web_ui.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/image_loader.h"
+#include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
@@ skipping 380 matching lines @@
     ForwardFaviconResult(request, gfx::Image());
     return;
   }
   const Extension* extension = service->extensions()->GetByID(page_url.host());
   if (!extension) {
     ForwardFaviconResult(request, gfx::Image());
     return;
   }
 
   // Fetch resources for all supported scale factors for which there are
-  // resources. Load image reps for all supported scale factors immediately
-  // instead of in an as needed fashion to be consistent with how favicons
-  // are requested for chrome:// and page URLs.
+  // resources. Load image reps for all supported scale factors (in addition to
+  // 1x) immediately instead of in an as needed fashion to be consistent with
+  // how favicons are requested for chrome:// and page URLs.
   const std::vector<ui::ScaleFactor>& scale_factors =
-      ui::GetSupportedScaleFactors();
+      FaviconUtil::GetFaviconScaleFactors();
   std::vector<extensions::ImageLoader::ImageRepresentation> info_list;
   for (size_t i = 0; i < scale_factors.size(); ++i) {
     float scale = ui::GetScaleFactorScale(scale_factors[i]);
     int pixel_size = static_cast<int>(gfx::kFaviconSize * scale);
     ExtensionResource icon_resource =
         extension->GetIconResource(pixel_size,
                                    ExtensionIconSet::MATCH_BIGGER);
 
     info_list.push_back(
         extensions::ImageLoader::ImageRepresentation(
             icon_resource,
             extensions::ImageLoader::ImageRepresentation::ALWAYS_RESIZE,
             gfx::Size(pixel_size, pixel_size),
             scale_factors[i]));
   }
 
   extensions::ImageLoader::Get(profile)->LoadImagesAsync(
       extension, info_list,
       base::Bind(&ForwardFaviconResult,
                  scoped_refptr<FaviconService::GetFaviconRequest>(request)));
 }