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"
 
 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;
 }
 
 gfx::Display GetDisplay(const MONITORINFOEX& monitor_info) {
-  int64_t id =
-      static_cast<int64_t>(base::Hash(base::WideToUTF8(monitor_info.szDevice)));
+  int64_t id = gfx::ScreenWin::GenerateDisplayId(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);
 
   DEVMODE mode;
   memset(&mode, 0, sizeof(DEVMODE));
   mode.dmSize = sizeof(DEVMODE);
@@ skipping 58 matching lines @@
 HWND ScreenWin::GetHWNDFromNativeView(NativeView window) const {
   NOTREACHED();
   return NULL;
 }
 
 NativeWindow ScreenWin::GetNativeWindowFromHWND(HWND hwnd) const {
   NOTREACHED();
   return NULL;
 }
 
+// static
+int64_t ScreenWin::GenerateDisplayId(const std::wstring& str) {
+  return static_cast<int64_t>(base::Hash(base::WideToUTF8(str)));
+}
+
 gfx::Point ScreenWin::GetCursorScreenPoint() {
   POINT pt;
   GetCursorPos(&pt);
   gfx::Point cursor_pos_pixels(pt);
   return gfx::win::ScreenToDIPPoint(cursor_pos_pixels);
 }
 
 gfx::NativeWindow ScreenWin::GetWindowUnderCursor() {
   POINT cursor_loc;
   HWND hwnd = GetCursorPos(&cursor_loc) ? WindowFromPoint(cursor_loc) : NULL;
@@ skipping 87 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