Moves mash/wm into ash/mus

ash/mus/screenlock_layout.h

Index: ash/mus/screenlock_layout.h
diff --git a/mash/wm/screenlock_layout.h b/ash/mus/screenlock_layout.h
similarity index 56%
rename from mash/wm/screenlock_layout.h
rename to ash/mus/screenlock_layout.h
index 56ca4b95b44f47a5901dd01c494ef9a49ba706d9..1772da560ac2aee7cc53339112d09a5d478a6968 100644
--- a/mash/wm/screenlock_layout.h
+++ b/ash/mus/screenlock_layout.h
@@ -2,29 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_SCREENLOCK_LAYOUT_H_
-#define MASH_WM_SCREENLOCK_LAYOUT_H_
+#ifndef ASH_MUS_SCREENLOCK_LAYOUT_H_
+#define ASH_MUS_SCREENLOCK_LAYOUT_H_
 
+#include "ash/mus/layout_manager.h"
 #include "base/macros.h"
-#include "mash/wm/layout_manager.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 // Lays out the shelf within shelf containers.
 class ScreenlockLayout : public LayoutManager {
  public:
-  explicit ScreenlockLayout(mus::Window* owner);
+  explicit ScreenlockLayout(::mus::Window* owner);
   ~ScreenlockLayout() override;
 
  private:
   // Overridden from LayoutManager:
-  void LayoutWindow(mus::Window* window) override;
+  void LayoutWindow(::mus::Window* window) override;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenlockLayout);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_SCREENLOCK_LAYOUT_H_
+#endif  // ASH_MUS_SCREENLOCK_LAYOUT_H_