Index: ash/mus/frame/move_event_handler.cc |
diff --git a/mash/wm/frame/move_event_handler.cc b/ash/mus/frame/move_event_handler.cc |
similarity index 73% |
rename from mash/wm/frame/move_event_handler.cc |
rename to ash/mus/frame/move_event_handler.cc |
index aedbfb2d6929b3a83b350c3d40e7dc2c3d34238f..f16807b1bc9766291f206d4ea74f38821841e6c6 100644 |
--- a/mash/wm/frame/move_event_handler.cc |
+++ b/ash/mus/frame/move_event_handler.cc |
@@ -2,49 +2,48 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "mash/wm/frame/move_event_handler.h" |
+#include "ash/mus/frame/move_event_handler.h" |
+#include "ash/mus/bridge/wm_window_mus.h" |
#include "components/mus/public/cpp/window.h" |
#include "components/mus/public/cpp/window_manager_delegate.h" |
#include "components/mus/public/interfaces/cursor.mojom.h" |
-#include "mash/wm/bridge/wm_window_mus.h" |
-#include "mash/wm/bridge/wm_window_mus.h" |
#include "ui/aura/window.h" |
#include "ui/base/hit_test.h" |
#include "ui/events/event.h" |
-namespace mash { |
-namespace wm { |
+namespace ash { |
+namespace mus { |
namespace { |
-mus::mojom::Cursor CursorForWindowComponent(int window_component) { |
+::mus::mojom::Cursor CursorForWindowComponent(int window_component) { |
switch (window_component) { |
case HTBOTTOM: |
- return mus::mojom::Cursor::SOUTH_RESIZE; |
+ return ::mus::mojom::Cursor::SOUTH_RESIZE; |
case HTBOTTOMLEFT: |
- return mus::mojom::Cursor::SOUTH_WEST_RESIZE; |
+ return ::mus::mojom::Cursor::SOUTH_WEST_RESIZE; |
case HTBOTTOMRIGHT: |
- return mus::mojom::Cursor::SOUTH_EAST_RESIZE; |
+ return ::mus::mojom::Cursor::SOUTH_EAST_RESIZE; |
case HTLEFT: |
- return mus::mojom::Cursor::WEST_RESIZE; |
+ return ::mus::mojom::Cursor::WEST_RESIZE; |
case HTRIGHT: |
- return mus::mojom::Cursor::EAST_RESIZE; |
+ return ::mus::mojom::Cursor::EAST_RESIZE; |
case HTTOP: |
- return mus::mojom::Cursor::NORTH_RESIZE; |
+ return ::mus::mojom::Cursor::NORTH_RESIZE; |
case HTTOPLEFT: |
- return mus::mojom::Cursor::NORTH_WEST_RESIZE; |
+ return ::mus::mojom::Cursor::NORTH_WEST_RESIZE; |
case HTTOPRIGHT: |
- return mus::mojom::Cursor::NORTH_EAST_RESIZE; |
+ return ::mus::mojom::Cursor::NORTH_EAST_RESIZE; |
default: |
- return mus::mojom::Cursor::CURSOR_NULL; |
+ return ::mus::mojom::Cursor::CURSOR_NULL; |
} |
} |
} // namespace |
MoveEventHandler::MoveEventHandler( |
- mus::Window* mus_window, |
- mus::WindowManagerClient* window_manager_client, |
+ ::mus::Window* mus_window, |
+ ::mus::WindowManagerClient* window_manager_client, |
aura::Window* aura_window) |
: wm_window_(WmWindowMus::Get(mus_window)), |
window_manager_client_(window_manager_client), |
@@ -92,5 +91,5 @@ void MoveEventHandler::OnWindowDestroying(aura::Window* window) { |
Detach(); |
} |
-} // namespace wm |
-} // namespace mash |
+} // namespace mus |
+} // namespace ash |