Index: ash/wm/drag_window_controller.cc |
diff --git a/ash/wm/drag_window_controller.cc b/ash/wm/drag_window_controller.cc |
index 698f0d979b76fa3ed98dfdcfed1e8c226c7a5f09..365ce2f6538f2221f0a37c8d33290ff8b2a2c422 100644 |
--- a/ash/wm/drag_window_controller.cc |
+++ b/ash/wm/drag_window_controller.cc |
@@ -8,7 +8,6 @@ |
#include "ash/display/window_tree_host_manager.h" |
#include "ash/public/cpp/shell_window_ids.h" |
-#include "ash/screen_util.h" |
#include "ash/shell.h" |
#include "ash/wm/window_util.h" |
#include "base/memory/ptr_util.h" |
@@ -24,6 +23,7 @@ |
#include "ui/compositor/scoped_layer_animation_settings.h" |
#include "ui/views/view.h" |
#include "ui/views/widget/widget.h" |
+#include "ui/wm/core/coordinate_conversion.h" |
#include "ui/wm/core/shadow_types.h" |
#include "ui/wm/core/window_util.h" |
@@ -59,8 +59,8 @@ class DragWindowController::DragWindowDetails : public aura::WindowDelegate { |
if (!drag_window_) |
CreateDragWindow(original_window, bounds_in_screen); |
- gfx::Rect bounds_in_root = ScreenUtil::ConvertRectFromScreen( |
- drag_window_->parent(), bounds_in_screen); |
+ gfx::Rect bounds_in_root = bounds_in_screen; |
+ ::wm::ConvertRectFromScreen(drag_window_->parent(), &bounds_in_root); |
drag_window_->SetBounds(bounds_in_root); |
if (root_bounds_in_screen.Contains(drag_location_in_screen)) { |
SetOpacity(original_window, 1.f); |