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

ui/gfx/screen_win.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/screen_win.h"
 
 #include <windows.h>
-#include <stdint.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/hash.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/win_util.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/win/dpi.h"
+#include "ui/gfx/win/physical_size.h"
 
 namespace {
 
 MONITORINFOEX GetMonitorInfoForMonitor(HMONITOR monitor) {
   MONITORINFOEX monitor_info;
   ZeroMemory(&monitor_info, sizeof(MONITORINFOEX));
   monitor_info.cbSize = sizeof(monitor_info);
   GetMonitorInfo(monitor, &monitor_info);
   return monitor_info;
 }
 
+int64_t GenerateDisplayId(const std::string& str) {
+  return static_cast<int64_t>(base::Hash(str));
+}
+
 gfx::Display GetDisplay(const MONITORINFOEX& monitor_info) {
-  int64_t id =
-      static_cast<int64_t>(base::Hash(base::WideToUTF8(monitor_info.szDevice)));
+  int64_t id = GenerateDisplayId(base::WideToUTF8(monitor_info.szDevice));
   gfx::Rect bounds = gfx::Rect(monitor_info.rcMonitor);
   gfx::Display display(id);
   display.set_bounds(gfx::win::ScreenToDIPRect(bounds));
   display.set_work_area(
       gfx::win::ScreenToDIPRect(gfx::Rect(monitor_info.rcWork)));
   display.SetScaleAndBounds(gfx::GetDPIScale(), bounds);
 
+  int width_mm = 0;
+  int height_mm = 0;
+  std::vector<gfx::PhysicalDisplaySize> display_sizes =
+      gfx::GetPhysicalSizeForDisplays();
+  for (const auto& display_size : display_sizes) {
+    int64_t interface_id = GenerateDisplayId(display_size.display_name);
+    if (interface_id == id) {
+      width_mm = display_size.width_mm;
+      height_mm = display_size.height_mm;
+    }
+  }
+  display.SetPhysicalSize(width_mm, height_mm);
+
   DEVMODE mode;
   memset(&mode, 0, sizeof(DEVMODE));
   mode.dmSize = sizeof(DEVMODE);
   mode.dmDriverExtra = 0;
   if (EnumDisplaySettings(monitor_info.szDevice,
                           ENUM_CURRENT_SETTINGS,
                           &mode)) {
     switch (mode.dmDisplayOrientation) {
     case DMDO_DEFAULT:
       display.set_rotation(gfx::Display::ROTATE_0);
@@ skipping 158 matching lines @@
 std::vector<gfx::Display> ScreenWin::GetDisplaysForMonitorInfos(
     const std::vector<MONITORINFOEX>& monitor_infos) {
   std::vector<gfx::Display> displays;
   for (const MONITORINFOEX& monitor_info : monitor_infos)
     displays.push_back(GetDisplay(monitor_info));
 
   return displays;
 }
 
 }  // namespace gfx