diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 19:13:40 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 19:13:40 +0000 |
| commit | aa0759e04b57f8be7412036f0fed1435d460ab4e (patch) | |
| tree | 596d4617513e80a6c440ede8d421ec5a1c3b3174 /ash/display | |
| parent | e4c4b6cd5e8075f87a738ce53c3a27617f57704c (diff) | |
| download | chromium_src-aa0759e04b57f8be7412036f0fed1435d460ab4e.zip chromium_src-aa0759e04b57f8be7412036f0fed1435d460ab4e.tar.gz chromium_src-aa0759e04b57f8be7412036f0fed1435d460ab4e.tar.bz2 | |
Move Is*DisplaySizeBlackListed to ui/display and build it for non-X11 platforms as well
BUG=333413
Review URL: https://codereview.chromium.org/226163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_change_observer_chromeos.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc index e1b4c13..8e2c86e 100644 --- a/ash/display/display_change_observer_chromeos.cc +++ b/ash/display/display_change_observer_chromeos.cc @@ -18,10 +18,10 @@ #include "base/logging.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/x/x11_util.h" #include "ui/compositor/dip_util.h" #include "ui/display/chromeos/display_mode.h" #include "ui/display/chromeos/display_snapshot.h" +#include "ui/display/display_util.h" #include "ui/gfx/display.h" namespace ash { @@ -134,9 +134,7 @@ void DisplayChangeObserver::OnDisplayModeChanged( continue; float device_scale_factor = 1.0f; - if (!ui::IsXDisplaySizeBlackListed( - output.display->physical_size().width(), - output.display->physical_size().height()) && + if (!ui::IsDisplaySizeBlackListed(output.display->physical_size()) && (kInchInMm * mode_info->size().width() / output.display->physical_size().width()) > kHighDensityDPIThreshold) { device_scale_factor = 2.0f; |