Moves mash/wm into ash/mus

ash/mus/window_manager_application.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // 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"
 #include "ui/events/event.h"
 #include "ui/events/mojo/input_events_type_converters.h"
 #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) {}
 
 WindowManagerApplication::~WindowManagerApplication() {
   // AcceleratorRegistrarImpl removes an observer in its destructor. Destroy
   // it early on.
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars(
       accelerator_registrars_);
   for (AcceleratorRegistrarImpl* registrar : accelerator_registrars)
@@ skipping 12 matching lines @@
   }
   return root_controllers;
 }
 
 void WindowManagerApplication::OnRootWindowControllerGotRoot(
     RootWindowController* root_controller) {
   if (globals_)
     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);
 }
 
 void WindowManagerApplication::OnRootWindowControllerDoneInit(
     RootWindowController* root_controller) {
   if (!screen_) {
     std::unique_ptr<views::ScreenMus> screen(new views::ScreenMus(nullptr));
     screen->Init(connector_);
@@ skipping 20 matching lines @@
 void WindowManagerApplication::OnRootWindowDestroyed(
     RootWindowController* root_controller) {
   root_controllers_.erase(root_controller);
   user_window_controller_.reset(nullptr);
 }
 
 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;
     }
   }
 }
 
 void WindowManagerApplication::AddRootWindowsObserver(
     RootWindowsObserver* observer) {
   root_windows_observers_.AddObserver(observer);
 }
 
@@ skipping 12 matching lines @@
   root_controllers_.insert(root_window_controller);
 }
 
 void WindowManagerApplication::Initialize(shell::Connector* connector,
                                           const shell::Identity& identity,
                                           uint32_t id) {
   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());
   }
 
   shelf_layout_.reset(new ShelfLayoutImpl);
   user_window_controller_.reset(new UserWindowControllerImpl());
 }
 
 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;
 }
 
 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>(
+    shelf_layout_requests_.push_back(base::WrapUnique(
+        new mojo::InterfaceRequest<mojom::ShelfLayout>(std::move(request))));
+  }
+}
+
+void WindowManagerApplication::Create(
+    shell::Connection* connection,
+    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<mojom::UserWindowController>(
             std::move(request))));
   }
 }
 
 void WindowManagerApplication::Create(
     shell::Connection* connection,
-    mojo::InterfaceRequest<ash::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>(
-            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
     // possible to end up with multiple active registrars with the same
     // namespace, but it is highly unlikely. In the event that multiple
     // registrars have the same namespace, this new registrar will be unable to
     // install accelerators.
     accelerator_registrar_count = 0;
   }
   accelerator_registrars_.insert(new AcceleratorRegistrarImpl(
       this, ++accelerator_registrar_count, std::move(request),
       base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
                  base::Unretained(this))));
 }
 
 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