Pass in a set of requested favicon pixel sizes to the HistoryService

chrome/browser/ui/views/create_application_shortcut_view.cc

Index: chrome/browser/ui/views/create_application_shortcut_view.cc
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index 84dfbcfd06c0b58a96443b91bf348308c2207434..2f2aeea562380565acdedf7b6062e55898e42714 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -497,15 +497,14 @@ void CreateUrlApplicationShortcutView::DidDownloadFavicon(
   SkBitmap image;
 
   if (!bitmaps.empty()) {
-    std::vector<ui::ScaleFactor> scale_factors;
-    ui::ScaleFactor scale_factor = ui::GetSupportedScaleFactor(
-        ui::GetScaleFactorForNativeView(
-            web_contents_->GetRenderViewHost()->GetView()->GetNativeView()));
-    scale_factors.push_back(scale_factor);
+    std::vector<int> requested_sizes_in_pixel;
+    float scale = ui::GetScaleFactorForNativeView(
+        web_contents_->GetRenderViewHost()->GetView()->GetNativeView());
+    requested_sizes_in_pixel.push_back(
+        static_cast<int>(requested_size * scale + 0.5f));

[sky, 2014/06/18 22:16:51]

Same question about the .5 here.

     std::vector<size_t> closest_indices;
     SelectFaviconFrameIndices(original_bitmap_sizes,
-                              scale_factors,
-                              requested_size,
+                              requested_sizes_in_pixel,
                               &closest_indices,
                               NULL);
     size_t closest_index = closest_indices[0];