Hookup device dpi for ChromeOS

ash/display/display_info.cc

 // Copyright (c) 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 <stdio.h>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_info.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 #endif
 
 namespace ash {
 namespace {
 
 // Use larger than max int to catch overflow early.
 const int64 kSynthesizedDisplayIdStart = 2200000000LL;
 
 int64 synthesized_display_id = kSynthesizedDisplayIdStart;
 
+const float kDpi96 = 96.0;
 bool use_125_dsf_for_ui_scaling = true;
 
 // Check the content of |spec| and fill |bounds| and |device_scale_factor|.
 // Returns true when |bounds| is found.
 bool GetDisplayBounds(
     const std::string& spec, gfx::Rect* bounds, float* device_scale_factor) {
   int width = 0;
   int height = 0;
   int x = 0;
   int y = 0;
@@ skipping 188 matching lines @@
 // static
 void DisplayInfo::SetUse125DSFForUIScalingForTest(bool enable) {
   use_125_dsf_for_ui_scaling = enable;
 }
 
 DisplayInfo::DisplayInfo()
     : id_(gfx::Display::kInvalidDisplayID),
       has_overscan_(false),
       touch_support_(gfx::Display::TOUCH_SUPPORT_UNKNOWN),
       device_scale_factor_(1.0f),
+      device_dpi_(kDpi96),
       overscan_insets_in_dip_(0, 0, 0, 0),
       configured_ui_scale_(1.0f),
       native_(false),
       is_aspect_preserving_scaling_(false),
       clear_overscan_insets_(false),
-      color_profile_(ui::COLOR_PROFILE_STANDARD) {
-}
+      color_profile_(ui::COLOR_PROFILE_STANDARD) {}
 
-DisplayInfo::DisplayInfo(int64 id,
-                         const std::string& name,
-                         bool has_overscan)
+DisplayInfo::DisplayInfo(int64 id, const std::string& name, bool has_overscan)
     : id_(id),
       name_(name),
       has_overscan_(has_overscan),
       touch_support_(gfx::Display::TOUCH_SUPPORT_UNKNOWN),
       device_scale_factor_(1.0f),
+      device_dpi_(kDpi96),
       overscan_insets_in_dip_(0, 0, 0, 0),
       configured_ui_scale_(1.0f),
       native_(false),
       is_aspect_preserving_scaling_(false),
       clear_overscan_insets_(false),
-      color_profile_(ui::COLOR_PROFILE_STANDARD) {
-}
+      color_profile_(ui::COLOR_PROFILE_STANDARD) {}
 
 DisplayInfo::~DisplayInfo() {
 }
 
 void DisplayInfo::SetRotation(gfx::Display::Rotation rotation,
                               gfx::Display::RotationSource source) {
   rotations_[source] = rotation;
   rotations_[gfx::Display::ROTATION_SOURCE_ACTIVE] = rotation;
 }
 
@@ skipping 11 matching lines @@
 void DisplayInfo::Copy(const DisplayInfo& native_info) {
   DCHECK(id_ == native_info.id_);
   name_ = native_info.name_;
   has_overscan_ = native_info.has_overscan_;
 
   touch_support_ = native_info.touch_support_;
   input_devices_ = native_info.input_devices_;
   device_scale_factor_ = native_info.device_scale_factor_;
   DCHECK(!native_info.bounds_in_native_.IsEmpty());
   bounds_in_native_ = native_info.bounds_in_native_;
+  device_dpi_ = native_info.device_dpi_;
   size_in_pixel_ = native_info.size_in_pixel_;
   is_aspect_preserving_scaling_ = native_info.is_aspect_preserving_scaling_;
   display_modes_ = native_info.display_modes_;
   available_color_profiles_ = native_info.available_color_profiles_;
 
   // Rotation, ui_scale, color_profile and overscan are given by preference,
   // or unit tests. Don't copy if this native_info came from
   // DisplayChangeObserver.
   if (!native_info.native()) {
     // Update the overscan_insets_in_dip_ either if the inset should be
@@ skipping 141 matching lines @@
 
 void DisplayInfo::ClearInputDevices() {
   input_devices_.clear();
 }
 
 void ResetDisplayIdForTest() {
   synthesized_display_id = kSynthesizedDisplayIdStart;
 }
 
 }  // namespace ash