Moves mash/wm into ash/mus

ash/mus/layout_manager.cc

Index: ash/mus/layout_manager.cc
diff --git a/mash/wm/layout_manager.cc b/ash/mus/layout_manager.cc
similarity index 78%
rename from mash/wm/layout_manager.cc
rename to ash/mus/layout_manager.cc
index 1edef0aa345fc89aa833e699fb85ccc35b544ddb..41e1cd811c82bdf209c16cdeccce576a8094a346 100644
--- a/mash/wm/layout_manager.cc
+++ b/ash/mus/layout_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/layout_manager.h"
+#include "ash/mus/layout_manager.h"
 
 #include <stdint.h>
 
@@ -10,14 +10,14 @@
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 LayoutManager::~LayoutManager() {
   Uninstall();
 }
 
-LayoutManager::LayoutManager(mus::Window* owner) : owner_(owner) {
+LayoutManager::LayoutManager(::mus::Window* owner) : owner_(owner) {
   owner_->AddObserver(this);
   DCHECK(owner->children().empty());
 }
@@ -32,7 +32,7 @@ void LayoutManager::Uninstall() {
 }
 
 void LayoutManager::OnTreeChanged(
-    const mus::WindowObserver::TreeChangeParams& params) {
+    const ::mus::WindowObserver::TreeChangeParams& params) {
   DCHECK(params.target);
   if (params.new_parent == owner_) {
     // params.target was added to the layout.
@@ -46,12 +46,12 @@ void LayoutManager::OnTreeChanged(
   }
 }
 
-void LayoutManager::OnWindowDestroying(mus::Window* window) {
+void LayoutManager::OnWindowDestroying(::mus::Window* window) {
   if (owner_ == window)
     Uninstall();
 }
 
-void LayoutManager::OnWindowBoundsChanged(mus::Window* window,
+void LayoutManager::OnWindowBoundsChanged(::mus::Window* window,
                                           const gfx::Rect& old_bounds,
                                           const gfx::Rect& new_bounds) {
   if (window != owner_)
@@ -63,7 +63,7 @@ void LayoutManager::OnWindowBoundsChanged(mus::Window* window,
 }
 
 void LayoutManager::OnWindowSharedPropertyChanged(
-    mus::Window* window,
+    ::mus::Window* window,
     const std::string& name,
     const std::vector<uint8_t>* old_data,
     const std::vector<uint8_t>* new_data) {
@@ -75,12 +75,12 @@ void LayoutManager::OnWindowSharedPropertyChanged(
     LayoutWindow(window);
 }
 
-void LayoutManager::WindowAdded(mus::Window* window) {}
-void LayoutManager::WindowRemoved(mus::Window* window) {}
+void LayoutManager::WindowAdded(::mus::Window* window) {}
+void LayoutManager::WindowRemoved(::mus::Window* window) {}
 
 void LayoutManager::AddLayoutProperty(const std::string& name) {
   layout_properties_.insert(name);
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash