Moves mash/wm into ash/mus

ash/mus/shelf_layout_manager.h

Index: ash/mus/shelf_layout_manager.h
diff --git a/mash/wm/shelf_layout_manager.h b/ash/mus/shelf_layout_manager.h
similarity index 43%
rename from mash/wm/shelf_layout_manager.h
rename to ash/mus/shelf_layout_manager.h
index 39be5686258208a96ba1ee95fd6f02b7c5cde06e..14f4494f73e162a74de9e44067521175329a5ed5 100644
--- a/mash/wm/shelf_layout_manager.h
+++ b/ash/mus/shelf_layout_manager.h
@@ -2,48 +2,49 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_SHELF_LAYOUT_MANAGER_H_
-#define MASH_WM_SHELF_LAYOUT_MANAGER_H_
+#ifndef ASH_MUS_SHELF_LAYOUT_MANAGER_H_
+#define ASH_MUS_SHELF_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 {
 
 class ShelfLayoutManagerDelegate;
 
 // Lays out the shelf within shelf containers.
 class ShelfLayoutManager : public LayoutManager {
  public:
-  ShelfLayoutManager(mus::Window* owner, ShelfLayoutManagerDelegate* delegate);
+  ShelfLayoutManager(::mus::Window* owner,
+                     ShelfLayoutManagerDelegate* delegate);
   ~ShelfLayoutManager() override;
 
   // Returns the shelf, which may be null.
-  mus::Window* GetShelfWindow();
+  ::mus::Window* GetShelfWindow();
 
-  void SetAlignment(shelf::mojom::Alignment alignment);
-  void SetAutoHideBehavior(shelf::mojom::AutoHideBehavior auto_hide);
+  void SetAlignment(mash::shelf::mojom::Alignment alignment);
+  void SetAutoHideBehavior(mash::shelf::mojom::AutoHideBehavior auto_hide);
 
-  shelf::mojom::Alignment alignment() const { return alignment_; }
-  shelf::mojom::AutoHideBehavior auto_hide_behavior() const {
+  mash::shelf::mojom::Alignment alignment() const { return alignment_; }
+  mash::shelf::mojom::AutoHideBehavior auto_hide_behavior() const {
     return auto_hide_behavior_;
   }
 
  private:
   // Overridden from LayoutManager:
-  void LayoutWindow(mus::Window* window) override;
-  void WindowAdded(mus::Window* window) override;
+  void LayoutWindow(::mus::Window* window) override;
+  void WindowAdded(::mus::Window* window) override;
 
   ShelfLayoutManagerDelegate* delegate_;
-  shelf::mojom::Alignment alignment_;
-  shelf::mojom::AutoHideBehavior auto_hide_behavior_;
+  mash::shelf::mojom::Alignment alignment_;
+  mash::shelf::mojom::AutoHideBehavior auto_hide_behavior_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_SHELF_LAYOUT_MANAGER_H_
+#endif  // ASH_MUS_SHELF_LAYOUT_MANAGER_H_