Added capability on Windows to get the physical dimensions of your attached monitors. Also added th…

ui/gfx/display.cc

 // Copyright (c) 2012 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 "ui/gfx/display.h"
 
 #include <algorithm>
+#include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/size_conversions.h"
@@ skipping 52 matching lines @@
 // static
 void Display::ResetForceDeviceScaleFactorForTesting() {
   g_has_forced_device_scale_factor = -1;
   g_forced_device_scale_factor = -1.0;
 }
 
 Display::Display()
     : id_(kInvalidDisplayID),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0),
-      touch_support_(TOUCH_SUPPORT_UNKNOWN) {
-}
+      touch_support_(TOUCH_SUPPORT_UNKNOWN),
+      physical_width_mm_(0),
+      physical_height_mm_(0) {}
 
 Display::Display(int64_t id)
     : id_(id),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0),
-      touch_support_(TOUCH_SUPPORT_UNKNOWN) {}
+      touch_support_(TOUCH_SUPPORT_UNKNOWN),
+      physical_width_mm_(0),
+      physical_height_mm_(0) {}
 
 Display::Display(int64_t id, const gfx::Rect& bounds)
     : id_(id),
       bounds_(bounds),
       work_area_(bounds),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0),
-      touch_support_(TOUCH_SUPPORT_UNKNOWN) {
+      touch_support_(TOUCH_SUPPORT_UNKNOWN),
+      physical_width_mm_(0),
+      physical_height_mm_(0) {
 #if defined(USE_AURA)
   SetScaleAndBounds(device_scale_factor_, bounds);
 #endif
 }
 
 Display::~Display() {
 }
 
 int Display::RotationAsDegree() const {
   switch (rotation_) {
@@ skipping 82 matching lines @@
       bounds_.ToString().c_str(),
       work_area_.ToString().c_str(),
       device_scale_factor_,
       IsInternal() ? "internal" : "external");
 }
 
 bool Display::IsInternal() const {
   return is_valid() && (id_ == internal_display_id_);
 }
 
+bool Display::IsPhysicalSizeAvailable() const {
+  return physical_width_mm_ != 0 && physical_height_mm_ != 0;
+}
+
+gfx::Size Display::GetPhysicalSizeMm() const {
+  DCHECK(IsPhysicalSizeAvailable());
+  return gfx::Size(physical_width_mm_, physical_height_mm_);
+}
+
+void Display::SetPhysicalSize(int width_mm, int height_mm) {
+  physical_width_mm_ = width_mm;
+  physical_height_mm_ = height_mm;
+}
+
 // static
 int64_t Display::InternalDisplayId() {
   DCHECK_NE(kInvalidDisplayID, internal_display_id_);
   return internal_display_id_;
 }
 
 // static
 void Display::SetInternalDisplayId(int64_t internal_display_id) {
   internal_display_id_ = internal_display_id;
 }
 
 // static
 bool Display::IsInternalDisplayId(int64_t display_id) {
   DCHECK_NE(kInvalidDisplayID, display_id);
   return HasInternalDisplay() && internal_display_id_ == display_id;
 }
 
 // static
 bool Display::HasInternalDisplay() {
   return internal_display_id_ != kInvalidDisplayID;
 }
 
 }  // namespace gfx