Moves mash/wm into ash/mus

ash/mus/accelerator_registrar_impl.h

Index: ash/mus/accelerator_registrar_impl.h
diff --git a/mash/wm/accelerator_registrar_impl.h b/ash/mus/accelerator_registrar_impl.h
similarity index 76%
rename from mash/wm/accelerator_registrar_impl.h
rename to ash/mus/accelerator_registrar_impl.h
index 3bde90fff237798987e80fe061d2088b5801ff90..2c52d455c452c68b83616f3b3b0c511a3dad361c 100644
--- a/mash/wm/accelerator_registrar_impl.h
+++ b/ash/mus/accelerator_registrar_impl.h
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_ACCELERATOR_REGISTRAR_IMPL_H_
-#define MASH_WM_ACCELERATOR_REGISTRAR_IMPL_H_
+#ifndef ASH_MUS_ACCELERATOR_REGISTRAR_IMPL_H_
+#define ASH_MUS_ACCELERATOR_REGISTRAR_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
 
+#include "ash/mus/root_windows_observer.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
-#include "mash/wm/root_windows_observer.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class WindowManagerApplication;
 
@@ -25,7 +25,7 @@ class WindowManagerApplication;
 // connection. This manages its own lifetime, and destroys itself when the
 // AcceleratorRegistrar and all its AcceleratorHandlers are disconnected. Upon
 // destruction, it calls the DestroyCallback.
-class AcceleratorRegistrarImpl : public mus::mojom::AcceleratorRegistrar,
+class AcceleratorRegistrarImpl : public ::mus::mojom::AcceleratorRegistrar,
                                  public RootWindowsObserver {
  public:
   using DestroyCallback = base::Callback<void(AcceleratorRegistrarImpl*)>;
@@ -40,7 +40,8 @@ class AcceleratorRegistrarImpl : public mus::mojom::AcceleratorRegistrar,
   // specified id.
   bool OwnsAccelerator(uint32_t accelerator_id) const;
 
-  void ProcessAccelerator(uint32_t accelerator_id, mus::mojom::EventPtr event);
+  void ProcessAccelerator(uint32_t accelerator_id,
+                          ::mus::mojom::EventPtr event);
 
  private:
   struct Accelerator;
@@ -56,10 +57,10 @@ class AcceleratorRegistrarImpl : public mus::mojom::AcceleratorRegistrar,
 
   void RemoveAllAccelerators();
 
-  // mus::mojom::AcceleratorRegistrar:
-  void SetHandler(mus::mojom::AcceleratorHandlerPtr handler) override;
+  // ::mus::mojom::AcceleratorRegistrar:
+  void SetHandler(::mus::mojom::AcceleratorHandlerPtr handler) override;
   void AddAccelerator(uint32_t accelerator_id,
-                      mus::mojom::EventMatcherPtr matcher,
+                      ::mus::mojom::EventMatcherPtr matcher,
                       const AddAcceleratorCallback& callback) override;
   void RemoveAccelerator(uint32_t accelerator_id) override;
 
@@ -67,7 +68,7 @@ class AcceleratorRegistrarImpl : public mus::mojom::AcceleratorRegistrar,
   void OnRootWindowControllerAdded(RootWindowController* controller) override;
 
   WindowManagerApplication* wm_app_;
-  mus::mojom::AcceleratorHandlerPtr accelerator_handler_;
+  ::mus::mojom::AcceleratorHandlerPtr accelerator_handler_;
   mojo::Binding<AcceleratorRegistrar> binding_;
   uint32_t accelerator_namespace_;
   std::map<uint32_t, Accelerator> accelerators_;
@@ -76,7 +77,7 @@ class AcceleratorRegistrarImpl : public mus::mojom::AcceleratorRegistrar,
   DISALLOW_COPY_AND_ASSIGN(AcceleratorRegistrarImpl);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_ACCELERATOR_REGISTRAR_IMPL_H_
+#endif  // ASH_MUS_ACCELERATOR_REGISTRAR_IMPL_H_