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

Unified Diff: chrome/browser/favicon/favicon_tab_helper.cc

Issue 10824296: Enables HiDPI favicon to be displayed in tab strip on CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/tab_icon_view.h » ('j') | ui/gfx/image/image_skia.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/favicon_tab_helper.cc
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc
index 649527224d2320742a7ed224d7447cb3d0478778..7a02c29d077ab8e45f6a4dee54c7e070e66ea11b 100644
--- a/chrome/browser/favicon/favicon_tab_helper.cc
+++ b/chrome/browser/favicon/favicon_tab_helper.cc
@@ -198,11 +198,7 @@ void FaviconTabHelper::OnDidDownloadFavicon(
// TODO: Possibly do bitmap selection in FaviconHandler, so that it can score
// favicons better.
std::vector<ui::ScaleFactor> scale_factors;
-#if defined(OS_MACOSX)
scale_factors = ui::GetSupportedScaleFactors();
-#else
- scale_factors.push_back(ui::SCALE_FACTOR_100P); // TODO: Aura?
-#endif
gfx::Image favicon(
SelectFaviconFrames(bitmaps, scale_factors, requested_size));
favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, favicon);
« no previous file with comments | « no previous file | chrome/browser/ui/views/tab_icon_view.h » ('j') | ui/gfx/image/image_skia.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698