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

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 11 matching lines @@
 }
 
 float GetForcedDeviceScaleFactorImpl() {
   double scale_in_double = 1.0;
   if (HasForceDeviceScaleFactorImpl()) {
     std::string value = CommandLine::ForCurrentProcess()->
         GetSwitchValueASCII(switches::kForceDeviceScaleFactor);
     if (!base::StringToDouble(value, &scale_in_double))
       LOG(ERROR) << "Failed to parse the default device scale factor:" << value;
   }
+#if defined(OS_WIN)
+  else {
+    static double os_scale = ui::GetDPIScale();
+    scale_in_double = os_scale;
+  }
+#endif
+
   return static_cast<float>(scale_in_double);
 }
 
 } // namespace
 
 const int64 Display::kInvalidDisplayID = -1;
 
 // static
 float Display::GetForcedDeviceScaleFactor() {
   static const float kForcedDeviceScaleFactor =
       GetForcedDeviceScaleFactorImpl();
   return kForcedDeviceScaleFactor;
 }
-
 //static
 bool Display::HasForceDeviceScaleFactor() {
   return HasForceDeviceScaleFactorImpl();
 }
 
+
 // static
 int64 Display::GetID(uint16 manufacturer_id,
                      uint16 product_code,
                      uint8 output_index) {
   int64 new_id = ((static_cast<int64>(manufacturer_id) << 24) |
                   (static_cast<int64>(product_code) << 8) | output_index);
   DCHECK_NE(kInvalidDisplayID, new_id);
   return new_id;
 }
 
 Display::Display()
     : id_(kInvalidDisplayID),
       device_scale_factor_(GetForcedDeviceScaleFactor()) {
 }
 
 Display::Display(int64 id)
     : id_(id),
       device_scale_factor_(GetForcedDeviceScaleFactor()) {
 }
 
 Display::Display(int64 id, const gfx::Rect& bounds)
     : id_(id),
       bounds_(bounds),
       work_area_(bounds),
       device_scale_factor_(GetForcedDeviceScaleFactor()) {
-#if defined(USE_AURA)
+#if defined(USE_AURA) // || defined(OS_WIN)
   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(),
                      bounds_.bottom() - work_area_.bottom(),
                      bounds_.right() - work_area_.right());
 }
 
 void Display::SetScaleAndBounds(
     float device_scale_factor,
     const gfx::Rect& bounds_in_pixel) {
   Insets insets = bounds_.InsetsFrom(work_area_);
   if (!HasForceDeviceScaleFactor()) {
 #if defined(OS_MACOSX)
     // Unless an explicit scale factor was provided for testing, ensure the
     // scale is integral.
     device_scale_factor = static_cast<int>(device_scale_factor);
 #endif
     device_scale_factor_ = device_scale_factor;
   }
   device_scale_factor_ = std::max(1.0f, device_scale_factor_);
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_WIN)
   bounds_in_pixel_ = bounds_in_pixel;
 #endif
   bounds_ = gfx::Rect(gfx::ToFlooredSize(
       gfx::ScaleSize(bounds_in_pixel.size(), 1.0f / device_scale_factor_)));
   UpdateWorkAreaFromInsets(insets);
 }
 
 void Display::SetSize(const gfx::Size& size_in_pixel) {
   SetScaleAndBounds(
       device_scale_factor_,
-#if defined(USE_AURA)
+#if defined(USE_AURA) || defined(OS_WIN)
       gfx::Rect(bounds_in_pixel_.origin(), size_in_pixel));
 #else
       gfx::Rect(bounds_.origin(), size_in_pixel));
 #endif
 }
 
 void Display::UpdateWorkAreaFromInsets(const gfx::Insets& insets) {
   work_area_ = bounds_;
   work_area_.Inset(insets);
 }
 
 gfx::Size Display::GetSizeInPixel() const {
   return gfx::ToFlooredSize(gfx::ScaleSize(size(), device_scale_factor_));
 }
 
 std::string Display::ToString() const {
   return base::StringPrintf("Display[%lld] bounds=%s, workarea=%s, scale=%f",
                             static_cast<long long int>(id_),
                             bounds_.ToString().c_str(),
                             work_area_.ToString().c_str(),
                             device_scale_factor_);
 }
 
 }  // namespace gfx