| Index: ash/mus/frame/move_event_handler.cc
|
| diff --git a/ash/mus/frame/move_event_handler.cc b/ash/mus/frame/move_event_handler.cc
|
| index b2983b4fd51948eca2ab020ede1547b67fd294ae..ea3bd4235d0e4bc1f404e054301f3a45677e140b 100644
|
| --- a/ash/mus/frame/move_event_handler.cc
|
| +++ b/ash/mus/frame/move_event_handler.cc
|
| @@ -28,26 +28,26 @@ namespace ash {
|
| namespace mus {
|
| namespace {
|
|
|
| -::ui::mojom::Cursor CursorForWindowComponent(int window_component) {
|
| +ui::mojom::Cursor CursorForWindowComponent(int window_component) {
|
| switch (window_component) {
|
| case HTBOTTOM:
|
| - return ::ui::mojom::Cursor::SOUTH_RESIZE;
|
| + return ui::mojom::Cursor::SOUTH_RESIZE;
|
| case HTBOTTOMLEFT:
|
| - return ::ui::mojom::Cursor::SOUTH_WEST_RESIZE;
|
| + return ui::mojom::Cursor::SOUTH_WEST_RESIZE;
|
| case HTBOTTOMRIGHT:
|
| - return ::ui::mojom::Cursor::SOUTH_EAST_RESIZE;
|
| + return ui::mojom::Cursor::SOUTH_EAST_RESIZE;
|
| case HTLEFT:
|
| - return ::ui::mojom::Cursor::WEST_RESIZE;
|
| + return ui::mojom::Cursor::WEST_RESIZE;
|
| case HTRIGHT:
|
| - return ::ui::mojom::Cursor::EAST_RESIZE;
|
| + return ui::mojom::Cursor::EAST_RESIZE;
|
| case HTTOP:
|
| - return ::ui::mojom::Cursor::NORTH_RESIZE;
|
| + return ui::mojom::Cursor::NORTH_RESIZE;
|
| case HTTOPLEFT:
|
| - return ::ui::mojom::Cursor::NORTH_WEST_RESIZE;
|
| + return ui::mojom::Cursor::NORTH_WEST_RESIZE;
|
| case HTTOPRIGHT:
|
| - return ::ui::mojom::Cursor::NORTH_EAST_RESIZE;
|
| + return ui::mojom::Cursor::NORTH_EAST_RESIZE;
|
| default:
|
| - return ::ui::mojom::Cursor::CURSOR_NULL;
|
| + return ui::mojom::Cursor::CURSOR_NULL;
|
| }
|
| }
|
|
|
| @@ -60,8 +60,8 @@ void OnMoveLoopCompleted(const base::Callback<void(bool success)>& end_closure,
|
| } // namespace
|
|
|
| MoveEventHandler::MoveEventHandler(
|
| - ::ui::Window* mus_window,
|
| - ::ui::WindowManagerClient* window_manager_client,
|
| + ui::Window* mus_window,
|
| + ui::WindowManagerClient* window_manager_client,
|
| aura::Window* aura_window)
|
| : wm_window_(WmWindowMus::Get(mus_window)),
|
| window_manager_client_(window_manager_client),
|
|
|