ui/base/layout.cc - Issue 674763002: remove ui::gfx::GetDeviceScaleFactor

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: ui/base/layout.cc

Issue 674763002: remove ui::gfx::GetDeviceScaleFactor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dpi-cleanup-3

Patch Set: rebase-4 Created 6 years, 2 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: ui/base/layout.cc

diff --git a/ui/base/layout.cc b/ui/base/layout.cc

index 59b913becdc73a41e24ec74184dc775af644afca..f6362ac94830b8dc39735e64f09573ef6bfbfa4a 100644

--- a/ui/base/layout.cc

+++ b/ui/base/layout.cc

@@ -85,7 +85,7 @@ ScaleFactor GetSupportedScaleFactor(float scale) {

float GetImageScale(ScaleFactor scale_factor) {

#if defined(OS_WIN)

if (gfx::IsHighDPIEnabled())

- return gfx::win::GetDeviceScaleFactor();

+ return gfx::GetDPIScale();

#endif

return GetScaleForScaleFactor(scale_factor);

}