Re-introduce IsDisplayBlacklisted for internal display.

ash/display/display_change_observer_chromeos.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_change_observer_chromeos.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 174 matching lines @@
         gfx::Display::InternalDisplayId() == gfx::Display::kInvalidDisplayID) {
       gfx::Display::SetInternalDisplayId(state.display->display_id());
     }
 
     const ui::DisplayMode* mode_info = state.display->current_mode();
     if (!mode_info)
       continue;
 
     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(
               state.display->display_id(), &mode)) {
         device_scale_factor = mode.device_scale_factor;
       }
     }
     gfx::Rect display_bounds(state.display->origin(), mode_info->size());
 
     std::string name =
@@ skipping 46 matching lines @@
 // static
 float DisplayChangeObserver::FindDeviceScaleFactor(float dpi) {
   for (size_t i = 0; i < arraysize(kThresholdTable); ++i) {
     if (dpi > kThresholdTable[i].dpi)
       return kThresholdTable[i].device_scale_factor;
   }
   return 1.0f;
 }
 
 }  // namespace ash