Moves mash/wm into ash/mus

ash/mus/background_layout.h

Index: ash/mus/background_layout.h
diff --git a/mash/wm/background_layout.h b/ash/mus/background_layout.h
similarity index 57%
rename from mash/wm/background_layout.h
rename to ash/mus/background_layout.h
index 40c2a351f0a7058b48f60111546a27efd20f1d1c..3e9b86bb9014dc068525fcfecb6ac751c33f49fe 100644
--- a/mash/wm/background_layout.h
+++ b/ash/mus/background_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_BACKGROUND_LAYOUT_H_
-#define MASH_WM_BACKGROUND_LAYOUT_H_
+#ifndef ASH_MUS_BACKGROUND_LAYOUT_H_
+#define ASH_MUS_BACKGROUND_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 desktop background within background containers.
 class BackgroundLayout : public LayoutManager {
  public:
-  explicit BackgroundLayout(mus::Window* owner);
+  explicit BackgroundLayout(::mus::Window* owner);
   ~BackgroundLayout() override;
 
  private:
   // Overridden from LayoutManager:
-  void LayoutWindow(mus::Window* window) override;
+  void LayoutWindow(::mus::Window* window) override;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundLayout);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_BACKGROUND_LAYOUT_H_
+#endif  // ASH_MUS_BACKGROUND_LAYOUT_H_