Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1767)

Unified Diff: ash/mus/shadow_controller.h

Issue 2029883002: Moves mash/wm into ash/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_static_assert
Patch Set: move comment Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/shadow.cc ('k') | ash/mus/shadow_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_
« no previous file with comments | « ash/mus/shadow.cc ('k') | ash/mus/shadow_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698