chrome/browser/favicon/favicon_tab_helper.cc - Issue 10824296: Enables HiDPI favicon to be displayed in tab strip on CrOS

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebased 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:

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 2dbdf5eee01ba7be700d457543fe2977d3b06a7d..bcb95d3f267d45942222e7394800517fe5e7fdff 100644

--- a/chrome/browser/favicon/favicon_tab_helper.cc

+++ b/chrome/browser/favicon/favicon_tab_helper.cc

@@ -199,11 +199,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, &score));

favicon_handler_->OnDidDownloadFavicon(

« no previous file with comments | « no previous file | chrome/browser/ui/views/tab_icon_view.h » ('j') | no next file with comments »