Index: ash/mus/shadow_controller.h |
diff --git a/mash/wm/shadow_controller.h b/ash/mus/shadow_controller.h |
similarity index 43% |
rename from mash/wm/shadow_controller.h |
rename to ash/mus/shadow_controller.h |
index c513fbefcbb8e2f246a463ea20497fc7ddf3e21c..82ca1cf6fd7498f4dd9deae4f626b6360994e851 100644 |
--- a/mash/wm/shadow_controller.h |
+++ b/ash/mus/shadow_controller.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_SHADOW_CONTROLLER_H_ |
-#define MASH_WM_SHADOW_CONTROLLER_H_ |
+#ifndef ASH_MUS_SHADOW_CONTROLLER_H_ |
+#define ASH_MUS_SHADOW_CONTROLLER_H_ |
#include "base/macros.h" |
#include "components/mus/public/cpp/window_observer.h" |
@@ -13,32 +13,32 @@ namespace mus { |
class WindowTreeClient; |
} |
-namespace mash { |
-namespace wm { |
+namespace ash { |
+namespace mus { |
-class ShadowController : public mus::WindowTreeClientObserver, |
- public mus::WindowObserver { |
+class ShadowController : public ::mus::WindowTreeClientObserver, |
+ public ::mus::WindowObserver { |
public: |
- explicit ShadowController(mus::WindowTreeClient* window_tree); |
+ explicit ShadowController(::mus::WindowTreeClient* window_tree); |
~ShadowController() override; |
private: |
- void SetActiveWindow(mus::Window* window); |
+ void SetActiveWindow(::mus::Window* window); |
// mus::WindowTreeClientObserver: |
- void OnWindowTreeFocusChanged(mus::Window* gained_focus, |
- mus::Window* lost_focus) override; |
+ void OnWindowTreeFocusChanged(::mus::Window* gained_focus, |
+ ::mus::Window* lost_focus) override; |
// mus::WindowObserver: |
- void OnWindowDestroying(mus::Window* window) override; |
+ void OnWindowDestroying(::mus::Window* window) override; |
- mus::WindowTreeClient* window_tree_; |
- mus::Window* active_window_; |
+ ::mus::WindowTreeClient* window_tree_; |
+ ::mus::Window* active_window_; |
DISALLOW_COPY_AND_ASSIGN(ShadowController); |
}; |
-} // namespace wm |
-} // namespace mash |
+} // namespace mus |
+} // namespace ash |
-#endif // MASH_WM_SHADOW_CONTROLLER_H_ |
+#endif // ASH_MUS_SHADOW_CONTROLLER_H_ |