summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-10 05:07:34 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-10 05:07:34 +0000
commit0e19df412d6aca25d6771348b83c4e85b5d0111f (patch)
tree019e52587c21fa8398445f9f3905afcd8f93aca7 /ash
parent01c4071cf8aa3a1aeafe472c1fe441d684ffbd64 (diff)
downloadchromium_src-0e19df412d6aca25d6771348b83c4e85b5d0111f.zip
chromium_src-0e19df412d6aca25d6771348b83c4e85b5d0111f.tar.gz
chromium_src-0e19df412d6aca25d6771348b83c4e85b5d0111f.tar.bz2
Modifies the threshold for hidpi displays.
It is really tough to use some 4K monitor from ChromeOS because the resolution is too high in comparison with the physical size. Better to use 2X mode in such case. BUG=348279 R=oshima@chromium.org TEST=manually Review URL: https://codereview.chromium.org/227593011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/display/display_change_observer_chromeos.cc15
1 files changed, 2 insertions, 13 deletions
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index cfc2301..7105477 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -30,13 +30,6 @@ using ui::DisplayConfigurator;
namespace {
-// The DPI threshold to detect high density screen.
-// Higher DPI than this will use device_scale_factor=2.
-const unsigned int kHighDensityDPIThreshold = 170;
-
-// 1 inch in mm.
-const float kInchInMm = 25.4f;
-
// Display mode list is sorted by (in descending priority):
// * the area in pixels.
// * refresh rate.
@@ -133,12 +126,8 @@ void DisplayChangeObserver::OnDisplayModeChanged(
if (!mode_info)
continue;
- float device_scale_factor = 1.0f;
- if (!ui::IsDisplaySizeBlackListed(state.display->physical_size()) &&
- (kInchInMm * mode_info->size().width() /
- state.display->physical_size().width()) > kHighDensityDPIThreshold) {
- device_scale_factor = 2.0f;
- }
+ float device_scale_factor = ui::GetScaleFactor(
+ state.display->physical_size(), mode_info->size());
gfx::Rect display_bounds(state.display->origin(), mode_info->size());
std::vector<DisplayMode> display_modes = GetDisplayModeList(state);