Moves mash/wm into ash/mus

ash/mus/status_layout_manager.cc

Index: ash/mus/status_layout_manager.cc
diff --git a/mash/wm/status_layout_manager.cc b/ash/mus/status_layout_manager.cc
similarity index 80%
rename from mash/wm/status_layout_manager.cc
rename to ash/mus/status_layout_manager.cc
index ad6ee59670777272ddbeb38e7ac484bd9bb3183b..aa83c4e0b8d77d24d0b9c619b94d3d3cad23876b 100644
--- a/mash/wm/status_layout_manager.cc
+++ b/ash/mus/status_layout_manager.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/status_layout_manager.h"
+#include "ash/mus/status_layout_manager.h"
 
+#include "ash/mus/property_util.h"
 #include "ash/public/interfaces/ash_window_type.mojom.h"
 #include "components/mus/public/cpp/window.h"
-#include "mash/wm/property_util.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
-StatusLayoutManager::StatusLayoutManager(mus::Window* owner)
+StatusLayoutManager::StatusLayoutManager(::mus::Window* owner)
     : LayoutManager(owner),
       alignment_(mash::shelf::mojom::Alignment::BOTTOM),
       auto_hide_behavior_(mash::shelf::mojom::AutoHideBehavior::NEVER) {
-  AddLayoutProperty(mus::mojom::WindowManager::kPreferredSize_Property);
+  AddLayoutProperty(::mus::mojom::WindowManager::kPreferredSize_Property);
 }
 
 StatusLayoutManager::~StatusLayoutManager() {}
@@ -25,8 +25,8 @@ StatusLayoutManager::~StatusLayoutManager() {}
 // layout as the number of children can vary when the application providing the
 // status area restarts.
 
-void StatusLayoutManager::LayoutWindow(mus::Window* window) {
-  if (GetAshWindowType(window) != ash::mojom::AshWindowType::STATUS_AREA) {
+void StatusLayoutManager::LayoutWindow(::mus::Window* window) {
+  if (GetAshWindowType(window) != mojom::AshWindowType::STATUS_AREA) {
     // TODO(jamescook): Layout for notifications and other windows.
     NOTIMPLEMENTED() << "Non-status-area window needs layout.";
     return;
@@ -52,7 +52,7 @@ void StatusLayoutManager::SetAlignment(
     return;
 
   alignment_ = alignment;
-  for (mus::Window* window : owner()->children())
+  for (::mus::Window* window : owner()->children())
     LayoutWindow(window);
 }
 
@@ -65,5 +65,5 @@ void StatusLayoutManager::SetAutoHideBehavior(
   NOTIMPLEMENTED();
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash