From 279ee67ca371e773546fa31055b88b71e9cf44ea Mon Sep 17 00:00:00 2001
From: "mukai@chromium.org"
 <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 12 Aug 2014 14:40:00 +0000
Subject: 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
---
 ash/display/display_change_observer_chromeos.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'ash')

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(
-- 
cgit v1.1