Fix high-DPI on Windows to make use of DIP scaling in WebKit.

ui/gfx/display.h

Index: ui/gfx/display.h
diff --git a/ui/gfx/display.h b/ui/gfx/display.h
index 5abe1be2cbc8a78c16a33b5da44c9695a323ddc3..bf39013dde02f517e3b2a02cd52bc707c51b3b2c 100644
--- a/ui/gfx/display.h
+++ b/ui/gfx/display.h
@@ -27,6 +27,7 @@ class UI_EXPORT Display {
   // Returns the forced device scale factor, which is given by
   // "--force-device-scale-factor".
   static float GetForcedDeviceScaleFactor();
+  static bool HasForceDeviceScaleFactor();
 
   // Returns 64-bit persistent ID for the specified manufacturer's ID and
   // serial#.
@@ -77,7 +78,7 @@ class UI_EXPORT Display {
   // Returns the display's size in pixel coordinates.
   gfx::Size GetSizeInPixel() const;
 
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_WIN)
   // TODO(oshima|skuhne): Eliminate the use of bounds_in_pixel in events_x.cc
   // and remove bounds_in_pixel from gfx::Display.
   // Returns the display's bounds in pixel coordinates.
@@ -96,7 +97,7 @@ class UI_EXPORT Display {
   int64 id_;
   Rect bounds_;
   Rect work_area_;
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_WIN)
   Rect bounds_in_pixel_;
 #endif
   float device_scale_factor_;