NOT FOR SUBMIT - Windows Views HiDPI

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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
@@ skipping 52 matching lines @@
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0) {
 }
 
 Display::Display(int64 id, const gfx::Rect& bounds)
     : id_(id),
       bounds_(bounds),
       work_area_(bounds),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0) {
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(ENABLE_HIDPI)
   SetScaleAndBounds(device_scale_factor_, bounds);
 #endif
 }
 
 Display::~Display() {
 }
 
 Insets Display::GetWorkAreaInsets() const {
   return gfx::Insets(work_area_.y() - bounds_.y(),
                      work_area_.x() - bounds_.x(),
@@ skipping 17 matching lines @@
   bounds_ = gfx::Rect(
       gfx::ToFlooredPoint(gfx::ScalePoint(bounds_in_pixel.origin(),
                                           1.0f / device_scale_factor_)),
       gfx::ToFlooredSize(gfx::ScaleSize(bounds_in_pixel.size(),
                                         1.0f / device_scale_factor_)));
   UpdateWorkAreaFromInsets(insets);
 }
 
 void Display::SetSize(const gfx::Size& size_in_pixel) {
   gfx::Point origin = bounds_.origin();
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(ENABLE_HIDPI)
   gfx::PointF origin_f = origin;
   origin_f.Scale(device_scale_factor_);
   origin.SetPoint(origin_f.x(), origin_f.y());
 #endif
   SetScaleAndBounds(device_scale_factor_, gfx::Rect(origin, size_in_pixel));
 }
 
 void Display::UpdateWorkAreaFromInsets(const gfx::Insets& insets) {
   work_area_ = bounds_;
   work_area_.Inset(insets);
@@ skipping 19 matching lines @@
 
 int64 Display::InternalDisplayId() {
   return internal_display_id_;
 }
 
 void Display::SetInternalDisplayId(int64 internal_display_id) {
   internal_display_id_ = internal_display_id;
 }
 
 }  // namespace gfx