diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 14:40:00 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 14:41:33 +0000 |
| commit | 279ee67ca371e773546fa31055b88b71e9cf44ea (patch) | |
| tree | f9e1279a919eae621b70e34fb6f4b084fc7f24b6 /ash | |
| parent | 1736b4ede6df05fb9ced0c4c597f402a6046ac9f (diff) | |
| download | chromium_src-279ee67ca371e773546fa31055b88b71e9cf44ea.zip chromium_src-279ee67ca371e773546fa31055b88b71e9cf44ea.tar.gz chromium_src-279ee67ca371e773546fa31055b88b71e9cf44ea.tar.bz2 | |
Re-introduce IsDisplayBlacklisted for internal display.
This was removed by r288412 but daisy chooses an incorrect
scale factor if missing.
BUG=402518
R=oshima@chromium.org
TEST=manually
Review URL: https://codereview.chromium.org/465783002
Cr-Commit-Position: refs/heads/master@{#288959}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/display/display_change_observer_chromeos.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc index 2634622..1df63bd 100644 --- a/ash/display/display_change_observer_chromeos.cc +++ b/ash/display/display_change_observer_chromeos.cc @@ -192,9 +192,11 @@ void DisplayChangeObserver::OnDisplayModeChanged( float device_scale_factor = 1.0f; if (state.display->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) { - device_scale_factor = - FindDeviceScaleFactor((kInchInMm * mode_info->size().width() / - state.display->physical_size().width())); + if (!ui::IsDisplaySizeBlackListed(state.display->physical_size())) { + device_scale_factor = + FindDeviceScaleFactor((kInchInMm * mode_info->size().width() / + state.display->physical_size().width())); + } } else { DisplayMode mode; if (Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId( |