Moves mash/wm/public -> ash/public

mash/wm/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 <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 127 matching lines @@
     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<mojom::ShelfLayout>(this);
-  connection->AddInterface<mojom::UserWindowController>(this);
+  connection->AddInterface<ash::mojom::ShelfLayout>(this);
+  connection->AddInterface<ash::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<mojom::ShelfLayout> request) {
+    mojo::InterfaceRequest<ash::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<mojom::ShelfLayout>(std::move(request))));
+    shelf_layout_requests_.push_back(
+        base::WrapUnique(new mojo::InterfaceRequest<ash::mojom::ShelfLayout>(
+            std::move(request))));
   }
 }
 
 void WindowManagerApplication::Create(
     shell::Connection* connection,
-    mojo::InterfaceRequest<mojom::UserWindowController> request) {
+    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<mojom::UserWindowController>(
+        new mojo::InterfaceRequest<ash::mojom::UserWindowController>(
             std::move(request))));
   }
 }
 
 void WindowManagerApplication::Create(
     shell::Connection* connection,
     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
@@ skipping 11 matching lines @@
 
 void WindowManagerApplication::CreateWindowManager(
     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