Index: ash/mus/frame/move_event_handler.h |
diff --git a/mash/wm/frame/move_event_handler.h b/ash/mus/frame/move_event_handler.h |
similarity index 77% |
rename from mash/wm/frame/move_event_handler.h |
rename to ash/mus/frame/move_event_handler.h |
index a62f52be2feb94d10182938f455a2d513f40fd91..db2f1f59ec54e785dd6f5ddaaded88c465f59cc6 100644 |
--- a/mash/wm/frame/move_event_handler.h |
+++ b/ash/mus/frame/move_event_handler.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef MASH_WM_FRAME_MOVE_EVENT_HANDLER_H_ |
-#define MASH_WM_FRAME_MOVE_EVENT_HANDLER_H_ |
+#ifndef ASH_MUS_FRAME_MOVE_EVENT_HANDLER_H_ |
+#define ASH_MUS_FRAME_MOVE_EVENT_HANDLER_H_ |
#include <memory> |
@@ -25,8 +25,8 @@ namespace ui { |
class CancelModeEvent; |
} |
-namespace mash { |
-namespace wm { |
+namespace ash { |
+namespace mus { |
class WmWindowMus; |
@@ -34,8 +34,8 @@ class WmWindowMus; |
// forwards to WmToplevelWindowEventHandler to handle the actual drag/resize. |
class MoveEventHandler : public ui::EventHandler, public aura::WindowObserver { |
public: |
- MoveEventHandler(mus::Window* mus_window, |
- mus::WindowManagerClient* window_manager_client, |
+ MoveEventHandler(::mus::Window* mus_window, |
+ ::mus::WindowManagerClient* window_manager_client, |
aura::Window* aura_window); |
~MoveEventHandler() override; |
@@ -52,16 +52,16 @@ class MoveEventHandler : public ui::EventHandler, public aura::WindowObserver { |
void OnWindowDestroying(aura::Window* window) override; |
WmWindowMus* wm_window_; |
- mus::WindowManagerClient* window_manager_client_; |
+ ::mus::WindowManagerClient* window_manager_client_; |
// The root window of the aura::Window supplied to the constructor. |
// MoveEventHandler is added as a pre-target handler (and observer) of this. |
aura::Window* root_window_; |
- ash::wm::WmToplevelWindowEventHandler toplevel_window_event_handler_; |
+ wm::WmToplevelWindowEventHandler toplevel_window_event_handler_; |
DISALLOW_COPY_AND_ASSIGN(MoveEventHandler); |
}; |
-} // namespace wm |
-} // namespace mash |
+} // namespace mus |
+} // namespace ash |
-#endif // MASH_WM_FRAME_MOVE_EVENT_HANDLER_H_ |
+#endif // ASH_MUS_FRAME_MOVE_EVENT_HANDLER_H_ |