Moves mash/wm/public -> ash/public

mash/wm/root_window_controller.h

 // Copyright 2016 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.
 
 #ifndef MASH_WM_ROOT_WINDOW_CONTROLLER_H_
 #define MASH_WM_ROOT_WINDOW_CONTROLLER_H_
 
 #include <memory>
 
+#include "ash/public/interfaces/container.mojom.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_client.h"
 #include "components/mus/public/cpp/window_tree_client_delegate.h"
 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/shelf_layout_manager_delegate.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "ui/display/display.h"
 
 namespace ash {
 class AlwaysOnTopController;
 }
 
 namespace mus {
 class WindowManagerClient;
@@ skipping 37 matching lines @@
   // Deletes this.
   void Destroy();
 
   shell::Connector* GetConnector();
 
   mus::Window* root() { return root_; }
 
   int window_count() { return window_count_; }
   void IncrementWindowCount() { ++window_count_; }
 
-  mus::Window* GetWindowForContainer(mojom::Container container);
+  mus::Window* GetWindowForContainer(ash::mojom::Container container);
   bool WindowIsContainer(const mus::Window* window) const;
 
   WindowManager* window_manager() { return window_manager_.get(); }
 
   mus::WindowManagerClient* window_manager_client();
 
   void OnAccelerator(uint32_t id, const ui::Event& event);
 
   const display::Display& display() const { return display_; }
 
@@ skipping 20 matching lines @@
   void OnWindowTreeClientDestroyed(mus::WindowTreeClient* client) override;
   void OnEventObserved(const ui::Event& event, mus::Window* target) override;
 
   // mus::WindowObserver:
   void OnWindowDestroyed(mus::Window* window) override;
 
   // ShelfLayoutManagerDelegate:
   void OnShelfWindowAvailable() override;
 
   // Sets up the window containers used for z-space management.
-  void CreateContainer(mash::wm::mojom::Container container,
-                       mash::wm::mojom::Container parent_container);
+  void CreateContainer(ash::mojom::Container container,
+                       ash::mojom::Container parent_container);
   void CreateContainers();
 
   WindowManagerApplication* app_;
   mus::Window* root_;
   int window_count_;
 
   std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_;
   std::unique_ptr<WmShelfMus> wm_shelf_;
 
   std::unique_ptr<WindowManager> window_manager_;
 
   std::map<mus::Window*, std::unique_ptr<LayoutManager>> layout_managers_;
 
   std::unique_ptr<ShadowController> shadow_controller_;
 
   display::Display display_;
 
   std::unique_ptr<ash::AlwaysOnTopController> always_on_top_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_ROOT_WINDOW_CONTROLLER_H_