Scale bounds in DesktopWindowTreeHostMus and in calls to SetBounds.

ui/views/mus/desktop_window_tree_host_mus.cc

 // Copyright 2016 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/views/mus/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/display/screen.h"
+#include "ui/gfx/geometry/dip_util.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace views {
@@ skipping 130 matching lines @@
   }
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   SetHitTestMask(mask_rect);
 }
 
+float DesktopWindowTreeHostMus::GetScaleFactor() const {
+  // TODO(sky): GetDisplayNearestWindow() should take a const aura::Window*.
+  return display::Screen::GetScreen()
+      ->GetDisplayNearestWindow(const_cast<aura::Window*>(window()))
+      .device_scale_factor();
+}
+
+void DesktopWindowTreeHostMus::SetBoundsInDips(
+    const gfx::Rect& bounds_in_dips) {
+  SetBounds(gfx::ConvertRectToPixel(GetScaleFactor(), bounds_in_dips));
+}
+
 void DesktopWindowTreeHostMus::Init(aura::Window* content_window,
                                     const Widget::InitParams& params) {
-  // TODO: handle device scale, http://crbug.com/663524.
   if (!params.bounds.IsEmpty())
-    SetBounds(params.bounds);
+    SetBoundsInDips(params.bounds);
 }
 
 void DesktopWindowTreeHostMus::OnNativeWidgetCreated(
     const Widget::InitParams& params) {
   if (params.parent && params.parent->GetHost()) {
     parent_ = static_cast<DesktopWindowTreeHostMus*>(params.parent->GetHost());
     parent_->children_.insert(this);
   }
   native_widget_delegate_->OnNativeWidgetCreated(true);
 }
@@ skipping 80 matching lines @@
   // aura::Window.
   return window()->IsVisible() &&
          (!parent_ ||
           static_cast<const internal::NativeWidgetPrivate*>(
               parent_->desktop_native_widget_aura_)
               ->IsVisible());
 }
 
 void DesktopWindowTreeHostMus::SetSize(const gfx::Size& size) {
   // Use GetBounds() as the origin of window() is always at 0, 0.
-  gfx::Rect screen_bounds = GetBounds();
-  // TODO: handle device scale, http://crbug.com/663524. Also, |screen_bounds|
-  // is in pixels and should be dip.
+  gfx::Rect screen_bounds =
+      gfx::ConvertRectToDIP(GetScaleFactor(), GetBounds());
   screen_bounds.set_size(size);
-  SetBounds(screen_bounds);
+  SetBoundsInDips(screen_bounds);
 }
 
 void DesktopWindowTreeHostMus::StackAbove(aura::Window* window) {
   // TODO: implement window stacking, http://crbug.com/663617.
   NOTIMPLEMENTED();
 }
 
 void DesktopWindowTreeHostMus::StackAtTop() {
   // TODO: implement window stacking, http://crbug.com/663617.
   NOTIMPLEMENTED();
 }
 
 void DesktopWindowTreeHostMus::CenterWindow(const gfx::Size& size) {
   gfx::Rect bounds_to_center_in = GetWorkAreaBoundsInScreen();
 
   // If there is a transient parent and it fits |size|, then center over it.
   aura::Window* content_window = desktop_native_widget_aura_->content_window();
   if (wm::GetTransientParent(content_window)) {
     gfx::Rect transient_parent_bounds =
         wm::GetTransientParent(content_window)->GetBoundsInScreen();
     if (transient_parent_bounds.height() >= size.height() &&
         transient_parent_bounds.width() >= size.width()) {
       bounds_to_center_in = transient_parent_bounds;
     }
   }
 
   gfx::Rect resulting_bounds(bounds_to_center_in);
   resulting_bounds.ClampToCenteredSize(size);
-
-  // TODO: handle device scale, http://crbug.com/663524. SetBounds() expects
-  // pixels.
-  SetBounds(resulting_bounds);
+  SetBoundsInDips(resulting_bounds);
 }
 
 void DesktopWindowTreeHostMus::GetWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
   // Implementation matches that of NativeWidgetAura.
   *bounds = GetRestoredBounds();
   *show_state = window()->GetProperty(aura::client::kShowStateKey);
 }
 
 gfx::Rect DesktopWindowTreeHostMus::GetWindowBoundsInScreen() const {
-  // TODO: convert to dips, http://crbug.com/663524.
-  return GetBounds();
+  return gfx::ConvertRectToDIP(GetScaleFactor(), GetBounds());
 }
 
 gfx::Rect DesktopWindowTreeHostMus::GetClientAreaBoundsInScreen() const {
   // View-to-screen coordinate system transformations depend on this returning
   // the full window bounds, for example View::ConvertPointToScreen().
   return GetWindowBoundsInScreen();
 }
 
 gfx::Rect DesktopWindowTreeHostMus::GetRestoredBounds() const {
   // Restored bounds should only be relevant if the window is minimized,
@@ skipping 225 matching lines @@
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(true);
 }
 
 void DesktopWindowTreeHostMus::HideImpl() {
   native_widget_delegate_->OnNativeWidgetVisibilityChanging(false);
   WindowTreeHostMus::HideImpl();
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(false);
 }
 
 void DesktopWindowTreeHostMus::SetBounds(const gfx::Rect& bounds_in_pixels) {
-  // TODO: handle conversion to dips, http://crbug.com/663524.
   gfx::Rect final_bounds_in_pixels = bounds_in_pixels;
   if (GetBounds().size() != bounds_in_pixels.size()) {
     gfx::Size size = bounds_in_pixels.size();
-    size.SetToMax(native_widget_delegate_->GetMinimumSize());
-    const gfx::Size max_size = native_widget_delegate_->GetMaximumSize();
-    if (!max_size.IsEmpty())
-      size.SetToMin(max_size);
+    size.SetToMax(gfx::ConvertSizeToPixel(
+        GetScaleFactor(), native_widget_delegate_->GetMinimumSize()));
+    const gfx::Size max_size_in_pixels = gfx::ConvertSizeToPixel(
+        GetScaleFactor(), native_widget_delegate_->GetMaximumSize());
+    if (!max_size_in_pixels.IsEmpty())
+      size.SetToMin(max_size_in_pixels);
     final_bounds_in_pixels.set_size(size);
   }
   WindowTreeHostMus::SetBounds(final_bounds_in_pixels);
 }
 
 void DesktopWindowTreeHostMus::OnWindowInitialized(aura::Window* window) {}
 
 void DesktopWindowTreeHostMus::OnActiveFocusClientChanged(
     aura::client::FocusClient* focus_client,
     aura::Window* window) {
   if (window == this->window()) {
     is_active_ = true;
     desktop_native_widget_aura_->HandleActivationChanged(true);
   } else if (is_active_) {
     is_active_ = false;
     desktop_native_widget_aura_->HandleActivationChanged(false);
   }
 }
 
 }  // namespace views