| Index: ash/wm/drag_window_resizer.cc
|
| diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc
|
| index d4cf8aae4b8a7f0fdb80f6a010c3abbbab1f1d29..fe64ceb91e5c9b2321bb21739c4952554a055b3b 100644
|
| --- a/ash/wm/drag_window_resizer.cc
|
| +++ b/ash/wm/drag_window_resizer.cc
|
| @@ -8,7 +8,6 @@
|
| #include "ash/common/wm/window_state.h"
|
| #include "ash/common/wm_window.h"
|
| #include "ash/display/mouse_cursor_event_filter.h"
|
| -#include "ash/screen_util.h"
|
| #include "ash/shell.h"
|
| #include "ash/wm/drag_window_controller.h"
|
| #include "ash/wm/window_util.h"
|
| @@ -92,7 +91,7 @@ void DragWindowResizer::CompleteDrag() {
|
| bounds.set_height(size.height());
|
|
|
| gfx::Rect dst_bounds =
|
| - ScreenUtil::ConvertRectToScreen(GetAuraTarget()->parent(), bounds);
|
| + ::wm::ConvertRectToScreen(GetAuraTarget()->parent(), bounds);
|
|
|
| // Adjust the position so that the cursor is on the window.
|
| if (!dst_bounds.Contains(last_mouse_location_in_screen)) {
|
| @@ -144,8 +143,8 @@ void DragWindowResizer::UpdateDragWindow(
|
| if (!drag_window_controller_)
|
| drag_window_controller_.reset(new DragWindowController(GetAuraTarget()));
|
|
|
| - const gfx::Rect bounds_in_screen = ScreenUtil::ConvertRectToScreen(
|
| - GetAuraTarget()->parent(), bounds_in_parent);
|
| + const gfx::Rect bounds_in_screen =
|
| + ::wm::ConvertRectToScreen(GetAuraTarget()->parent(), bounds_in_parent);
|
|
|
| gfx::Rect root_bounds_in_screen =
|
| GetAuraTarget()->GetRootWindow()->GetBoundsInScreen();
|
|
|