Moves mash/wm into ash/mus

ash/mus/status_layout_manager.h

Index: ash/mus/status_layout_manager.h
diff --git a/mash/wm/status_layout_manager.h b/ash/mus/status_layout_manager.h
similarity index 69%
rename from mash/wm/status_layout_manager.h
rename to ash/mus/status_layout_manager.h
index 1eb41e4554356a12a5d2d76fc5456bbec3b7b487..a40374a547bea9479197d533464f583e6163fc81 100644
--- a/mash/wm/status_layout_manager.h
+++ b/ash/mus/status_layout_manager.h
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_STATUS_LAYOUT_MANAGER_H_
-#define MASH_WM_STATUS_LAYOUT_MANAGER_H_
+#ifndef ASH_MUS_STATUS_LAYOUT_MANAGER_H_
+#define ASH_MUS_STATUS_LAYOUT_MANAGER_H_
 
+#include "ash/mus/layout_manager.h"
 #include "base/macros.h"
 #include "mash/shelf/public/interfaces/shelf_constants.mojom.h"
-#include "mash/wm/layout_manager.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 // Lays out the status container, which contains the status area widget and
 // notifications.
 class StatusLayoutManager : public LayoutManager {
  public:
-  explicit StatusLayoutManager(mus::Window* owner);
+  explicit StatusLayoutManager(::mus::Window* owner);
   ~StatusLayoutManager() override;
 
   void SetAlignment(mash::shelf::mojom::Alignment alignment);
@@ -24,7 +24,7 @@ class StatusLayoutManager : public LayoutManager {
 
  private:
   // Overridden from LayoutManager:
-  void LayoutWindow(mus::Window* window) override;
+  void LayoutWindow(::mus::Window* window) override;
 
   mash::shelf::mojom::Alignment alignment_;
   mash::shelf::mojom::AutoHideBehavior auto_hide_behavior_;
@@ -32,7 +32,7 @@ class StatusLayoutManager : public LayoutManager {
   DISALLOW_COPY_AND_ASSIGN(StatusLayoutManager);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_STATUS_LAYOUT_MANAGER_H_
+#endif  // ASH_MUS_STATUS_LAYOUT_MANAGER_H_