| Index: ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| index a8054a39b9a768f44632e40e1b16ddc5e866765f..48db1547dc6ede7d19ae16e0f3d1644590159c65 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| @@ -33,7 +33,6 @@
|
| #include "ui/base/hit_test.h"
|
| #include "ui/gfx/screen.h"
|
| #include "ui/views/widget/widget.h"
|
| -#include "ui/wm/core/coordinate_conversion.h"
|
|
|
| namespace ash {
|
|
|
| @@ -189,7 +188,7 @@
|
| gfx::Rect work_area =
|
| Shell::GetScreen()->GetDisplayNearestWindow(window).work_area();
|
| gfx::Point initial_location_in_screen = initial_location_in_parent_;
|
| - ::wm::ConvertPointToScreen(window->parent(), &initial_location_in_screen);
|
| + wm::ConvertPointToScreen(window->parent(), &initial_location_in_screen);
|
| // Drag the window left or right to the edge (or almost to it).
|
| if (edge == DOCKED_EDGE_LEFT)
|
| dx += work_area.x() - initial_location_in_screen.x();
|
|
|