Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4932)

Unified Diff: chrome/browser/ui/views/create_application_shortcut_view.cc

Issue 336423006: Pass in a set of requested favicon pixel sizes to the HistoryService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..550faa4f6d8dfcd816c30a335e73ba20cd4a5cf2 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/create_application_shortcut_view.h"
#include <algorithm>
+#include <cmath>
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -497,15 +498,13 @@ 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(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];
« no previous file with comments | « chrome/browser/history/history_service.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698