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

chrome/browser/ui/views/create_application_shortcut_view.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/create_application_shortcut_view.h"
 
 #include <algorithm>
+#include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 472 matching lines @@
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
   if (id != pending_download_id_)
     return;
   pending_download_id_ = -1;
 
   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(ceil(requested_size * scale));
     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];
     image = bitmaps[closest_index];
   }
 
   if (!image.isNull()) {
     shortcut_info_.favicon.Add(gfx::ImageSkia::CreateFrom1xBitmap(image));
     static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
   } else {
@@ skipping 34 matching lines @@
   if (!close_callback_.is_null())
     close_callback_.Run(false);
   return CreateApplicationShortcutView::Cancel();
 }
 
 // Called when the app's ShortcutInfo (with icon) is loaded.
 void CreateChromeApplicationShortcutView::OnShortcutInfoLoaded(
     const web_app::ShortcutInfo& shortcut_info) {
   shortcut_info_ = shortcut_info;
 }