chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 326143002: Remove ui::GetImageScale

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/ui/webui/chrome_web_ui_controller_factory.cc

Issue 326143002: Remove ui::GetImageScale (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix mac build 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:

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

index 986b7e8a7f08000003332debcae43657141c6bb5..abda424018fd4f526340f709fca6f5cb1975096f 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -606,7 +606,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(

// DIP.

- float scale = ui::GetImageScale(scale_factors[i]);

+ float scale = ui::GetScaleForScaleFactor(scale_factors[i]);

int edge_pixel_size =

static_cast<int>(gfx::kFaviconSize * scale + 0.5f);

bitmap_result.pixel_size = gfx::Size(edge_pixel_size, edge_pixel_size);

« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | ui/base/layout.h » ('j') | no next file with comments »