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

Unified Diff: chrome/browser/ui/webui/favicon_source.cc

Issue 331163003: [Refactor] Change FaviconService API to take in a desired pixel size (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/webui/favicon_source.cc
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 2b322eb3c769a722d8b01ff2d75b250eff3bf479..fa068744ff2c67e629df1adc32592e415258389b 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ui/webui/favicon_source.h"
+#include <cmath>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/strings/string_number_conversions.h"
@@ -77,15 +79,16 @@ void FaviconSource::StartDataRequest(
}
GURL url(parsed.url);
+ int desired_size_in_pixel =
+ std::ceil(parsed.size_in_dip * parsed.device_scale_factor);
if (parsed.is_icon_url) {
// TODO(michaelbai): Change GetRawFavicon to support combination of
// IconType.
- favicon_service->GetRawFavicon(
+ favicon_service->GetRawFavicon(
url,
favicon_base::FAVICON,
- parsed.size_in_dip,
- parsed.device_scale_factor,
+ desired_size_in_pixel,
base::Bind(
&FaviconSource::OnFaviconDataAvailable,
base::Unretained(this),
@@ -108,9 +111,9 @@ void FaviconSource::StartDataRequest(
}
favicon_service->GetRawFaviconForPageURL(
- FaviconService::FaviconForPageURLParams(
- url, icon_types_, parsed.size_in_dip),
- parsed.device_scale_factor,
+ url,
+ icon_types_,
+ desired_size_in_pixel,
base::Bind(
&FaviconSource::OnFaviconDataAvailable,
base::Unretained(this),
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_icon_source.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698