Index: ui/display/win/dpi.cc |
diff --git a/ui/display/win/dpi.cc b/ui/display/win/dpi.cc |
index 778d83b0d468dc2cd082e98831514f6fe6b3ddb1..cde5a46fffc88edc70e38ba0d5e166bb9a53efeb 100644 |
--- a/ui/display/win/dpi.cc |
+++ b/ui/display/win/dpi.cc |
@@ -51,8 +51,7 @@ void SetDefaultDeviceScaleFactor(float scale) { |
float GetDPIScale() { |
if (display::Display::HasForceDeviceScaleFactor()) |
return display::Display::GetForcedDeviceScaleFactor(); |
- float dpi_scale = GetUnforcedDeviceScaleFactor(); |
- return (dpi_scale <= 1.25f) ? 1.f : dpi_scale; |
robliao
2016/07/18 23:53:40
Update the ScreenWin unit tests to allow for the n
Bret
2016/07/19 18:30:30
Done.
|
+ return GetUnforcedDeviceScaleFactor(); |
oshima
2016/07/18 23:51:34
will this enable other values like 1.1 ? If so, yo
|
} |
int GetDPIFromScalingFactor(float device_scaling_factor) { |