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"
 #include "ui/gfx/switches.h"
 
+#if defined(OS_WIN)
+#include "ui/gfx/screen_win.h"
+#include "ui/gfx/win/physical_size.h"
+#endif
+
 namespace gfx {
 namespace {
 
 // This variable tracks whether the forced device scale factor switch needs to
 // be read from the command line, i.e. if it is set to -1 then the command line
 // is checked.
 int g_has_forced_device_scale_factor = -1;
 
 // This variable caches the forced device scale factor value which is read off
 // the command line. If the cache is invalidated by setting this variable to
@@ skipping 158 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::GetPhysicalSize(int* width_mm, int* height_mm) const {
+#if defined(OS_WIN)
+  std::vector<gfx::DisplaySize> display_sizes;
+  gfx::GetPhysicalSizeForDisplays(&display_sizes);
+  for (size_t i = 0; i < display_sizes.size(); ++i) {

[scottmg, 2016/01/09 01:00:05]

for (const auto& display_size : display_sizes) ?

[Bret, 2016/01/12 00:23:46]

Done.

+    const gfx::DisplaySize& display_size = display_sizes[i];
+    int64_t interface_id =
+        ScreenWin::GenerateDisplayId(display_size.display_name);
+    if (interface_id == id_) {
+      *width_mm = display_size.width_mm;
+      *height_mm = display_size.height_mm;
+      return true;
+    }
+  }
+  return false;
+#else
+  // unimplemented

[scottmg, 2016/01/09 01:00:05]

"Unimplemented." or just delete this line, since that's kind of what
NOTREACHED() means.

[Bret, 2016/01/12 00:23:46]

Done.

+  NOTREACHED();
+#endif
+}
+
 // 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