Moves mash/wm into ash/mus

ash/mus/window_manager_application.cc

Index: ash/mus/window_manager_application.cc
diff --git a/mash/wm/window_manager_application.cc b/ash/mus/window_manager_application.cc
similarity index 83%
rename from mash/wm/window_manager_application.cc
rename to ash/mus/window_manager_application.cc
index 51a1fa71bb114f3c806d9dd269592aded58fec1d..472cd79ea461c3e815bc2938a27d9ada1ebe35ea 100644
--- a/mash/wm/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/window_manager_application.h"
+#include "ash/mus/window_manager_application.h"
 
 #include <utility>
 
+#include "ash/mus/accelerator_registrar_impl.h"
+#include "ash/mus/bridge/wm_globals_mus.h"
+#include "ash/mus/bridge/wm_lookup_mus.h"
+#include "ash/mus/root_window_controller.h"
+#include "ash/mus/root_windows_observer.h"
+#include "ash/mus/shelf_layout_impl.h"
+#include "ash/mus/user_window_controller_impl.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "components/mus/common/event_matcher_util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
-#include "mash/wm/accelerator_registrar_impl.h"
-#include "mash/wm/bridge/wm_globals_mus.h"
-#include "mash/wm/bridge/wm_lookup_mus.h"
-#include "mash/wm/root_window_controller.h"
-#include "mash/wm/root_windows_observer.h"
-#include "mash/wm/shelf_layout_impl.h"
-#include "mash/wm/user_window_controller_impl.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
@@ -26,8 +26,8 @@
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/screen_mus.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 WindowManagerApplication::WindowManagerApplication()
     : connector_(nullptr), window_manager_factory_binding_(this) {}
@@ -60,7 +60,7 @@ void WindowManagerApplication::OnRootWindowControllerGotRoot(
     return;  // |root_controller| is the > 1 root, nothing to do.
 
   if (connector_)
-    aura_init_.reset(new views::AuraInit(connector_, "mash_wm_resources.pak"));
+    aura_init_.reset(new views::AuraInit(connector_, "ash_mus_resources.pak"));
 
   globals_.reset(new WmGlobalsMus(root_controller->root()->window_tree()));
   lookup_.reset(new WmLookupMus);
@@ -101,7 +101,7 @@ void WindowManagerApplication::OnAccelerator(uint32_t id,
                                              const ui::Event& event) {
   for (auto* registrar : accelerator_registrars_) {
     if (registrar->OwnsAccelerator(id)) {
-      registrar->ProcessAccelerator(id, mus::mojom::Event::From(event));
+      registrar->ProcessAccelerator(id, ::mus::mojom::Event::From(event));
       break;
     }
   }
@@ -134,7 +134,7 @@ void WindowManagerApplication::Initialize(shell::Connector* connector,
   if (connector) {
     tracing_.Initialize(connector, identity.name());
 
-    mus::mojom::WindowManagerFactoryServicePtr wm_factory_service;
+    ::mus::mojom::WindowManagerFactoryServicePtr wm_factory_service;
     connector_->ConnectToInterface("mojo:mus", &wm_factory_service);
     wm_factory_service->SetWindowManagerFactory(
         window_manager_factory_binding_.CreateInterfacePtrAndBind());
@@ -145,9 +145,9 @@ void WindowManagerApplication::Initialize(shell::Connector* connector,
 }
 
 bool WindowManagerApplication::AcceptConnection(shell::Connection* connection) {
-  connection->AddInterface<ash::mojom::ShelfLayout>(this);
-  connection->AddInterface<ash::mojom::UserWindowController>(this);
-  connection->AddInterface<mus::mojom::AcceleratorRegistrar>(this);
+  connection->AddInterface<mojom::ShelfLayout>(this);
+  connection->AddInterface<mojom::UserWindowController>(this);
+  connection->AddInterface<::mus::mojom::AcceleratorRegistrar>(this);
   if (connection->GetRemoteIdentity().name() == "mojo:mash_session")
     connection->GetInterface(&session_);
   return true;
@@ -155,33 +155,32 @@ bool WindowManagerApplication::AcceptConnection(shell::Connection* connection) {
 
 void WindowManagerApplication::Create(
     shell::Connection* connection,
-    mojo::InterfaceRequest<ash::mojom::ShelfLayout> request) {
+    mojo::InterfaceRequest<mojom::ShelfLayout> request) {
   // TODO(msw): Handle multiple shelves (one per display).
   if (!root_controllers_.empty() && (*root_controllers_.begin())->root()) {
     shelf_layout_bindings_.AddBinding(shelf_layout_.get(), std::move(request));
   } else {
-    shelf_layout_requests_.push_back(
-        base::WrapUnique(new mojo::InterfaceRequest<ash::mojom::ShelfLayout>(
-            std::move(request))));
+    shelf_layout_requests_.push_back(base::WrapUnique(
+        new mojo::InterfaceRequest<mojom::ShelfLayout>(std::move(request))));
   }
 }
 
 void WindowManagerApplication::Create(
     shell::Connection* connection,
-    mojo::InterfaceRequest<ash::mojom::UserWindowController> request) {
+    mojo::InterfaceRequest<mojom::UserWindowController> request) {
   if (!root_controllers_.empty() && (*root_controllers_.begin())->root()) {
     user_window_controller_bindings_.AddBinding(user_window_controller_.get(),
                                                 std::move(request));
   } else {
     user_window_controller_requests_.push_back(base::WrapUnique(
-        new mojo::InterfaceRequest<ash::mojom::UserWindowController>(
+        new mojo::InterfaceRequest<mojom::UserWindowController>(
             std::move(request))));
   }
 }
 
 void WindowManagerApplication::Create(
     shell::Connection* connection,
-    mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request) {
+    mojo::InterfaceRequest<::mus::mojom::AcceleratorRegistrar> request) {
   static int accelerator_registrar_count = 0;
   if (accelerator_registrar_count == std::numeric_limits<int>::max()) {
     // Restart from zero if we have reached the limit. It is technically
@@ -198,11 +197,11 @@ void WindowManagerApplication::Create(
 }
 
 void WindowManagerApplication::CreateWindowManager(
-    mus::mojom::DisplayPtr display,
-    mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) {
+    ::mus::mojom::DisplayPtr display,
+    mojo::InterfaceRequest<::mus::mojom::WindowTreeClient> client_request) {
   AddRootWindowController(RootWindowController::CreateFromDisplay(
       this, std::move(display), std::move(client_request)));
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash