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

ui/gfx/display.h

 // 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.
 
 #ifndef UI_GFX_DISPLAY_H_
 #define UI_GFX_DISPLAY_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/base/ui_export.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
 
 // Note: The screen and display currently uses pixel coordinate
 // system. For platforms that support DIP (density independent pixel),
 // |bounds()| and |work_area| will return values in DIP coordinate
 // system, not in backing pixels.
 class UI_EXPORT Display {
  public:
   // Creates a display with kInvalidDisplayID as default.
   Display();
   explicit Display(int64 id);
   Display(int64 id, const Rect& bounds);
   ~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#.
   static int64 GetID(uint16 manufacturer_id, uint32 serial_number);
 
   // Sets/Gets unique identifier associated with the display.
   // -1 means invalid display and it doesn't not exit.
   int64 id() const { return id_; }
   void set_id(int64 id) { id_ = id; }
 
@@ skipping 30 matching lines @@
   // between old bounds and work area.
   void SetSize(const gfx::Size& size_in_pixel);
 
   // Computes and updates the display's work are using
   // |work_area_insets| and the bounds.
   void UpdateWorkAreaFromInsets(const gfx::Insets& work_area_insets);
 
   // 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.
   const Rect& bounds_in_pixel() const { return bounds_in_pixel_; }
 #endif
 
   // Returns a string representation of the display;
   std::string ToString() const;
 
   // True if the display contains valid display id.
   bool is_valid() const { return id_ != kInvalidDisplayID; }
 
   static const int64 kInvalidDisplayID;
 
  private:
   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_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_DISPLAY_H_