(Not ready for review!) Toolbar and views high dpi support.

ui/gfx/display.h

Index: ui/gfx/display.h
diff --git a/ui/gfx/display.h b/ui/gfx/display.h
index 8b3f346902b7b9501fd2acf3ca7d662486c2c95c..bb54cfbdaa6673f21fa3955c2dfcdc9db69e0910 100644
--- a/ui/gfx/display.h
+++ b/ui/gfx/display.h
@@ -88,7 +88,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.
@@ -107,7 +107,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_;