Moves mash/wm/public -> ash/public

mash/wm/window_manager_application.h

 // 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.
 
 #ifndef MASH_WM_WINDOW_MANAGER_APPLICATION_H_
 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 
+#include "ash/public/interfaces/shelf_layout.mojom.h"
+#include "ash/public/interfaces/user_window_controller.mojom.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "mash/session/public/interfaces/session.mojom.h"
-#include "mash/wm/public/interfaces/shelf_layout.mojom.h"
-#include "mash/wm/public/interfaces/user_window_controller.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace display {
 class Screen;
 }
 
 namespace views {
@@ skipping 12 matching lines @@
 class RootWindowsObserver;
 class ShelfLayoutImpl;
 class UserWindowControllerImpl;
 class WmGlobalsMus;
 class WmLookupMus;
 class WmScreen;
 
 class WindowManagerApplication
     : public shell::ShellClient,
       public mus::mojom::WindowManagerFactory,
-      public shell::InterfaceFactory<mojom::ShelfLayout>,
-      public shell::InterfaceFactory<mojom::UserWindowController>,
+      public shell::InterfaceFactory<ash::mojom::ShelfLayout>,
+      public shell::InterfaceFactory<ash::mojom::UserWindowController>,
       public shell::InterfaceFactory<mus::mojom::AcceleratorRegistrar> {
  public:
   WindowManagerApplication();
   ~WindowManagerApplication() override;
 
   shell::Connector* connector() { return connector_; }
 
   // Returns the RootWindowControllers that have valid roots.
   //
   // NOTE: this does not return |controllers_| as most clients want a
@@ skipping 30 matching lines @@
 
   // Adds |root_window_controller| to the set of known roots.
   void AddRootWindowController(RootWindowController* root_window_controller);
 
   // shell::ShellClient:
   void Initialize(shell::Connector* connector,
                   const shell::Identity& identity,
                   uint32_t id) override;
   bool AcceptConnection(shell::Connection* connection) override;
 
-  // shell::InterfaceFactory<mojom::ShelfLayout>:
+  // shell::InterfaceFactory<ash::mojom::ShelfLayout>:
   void Create(shell::Connection* connection,
-              mojo::InterfaceRequest<mojom::ShelfLayout> request) override;
+              mojo::InterfaceRequest<ash::mojom::ShelfLayout> request) override;
 
-  // shell::InterfaceFactory<mojom::UserWindowController>:
-  void Create(
-      shell::Connection* connection,
-      mojo::InterfaceRequest<mojom::UserWindowController> request) override;
+  // shell::InterfaceFactory<ash::mojom::UserWindowController>:
+  void Create(shell::Connection* connection,
+              mojo::InterfaceRequest<ash::mojom::UserWindowController> request)
+      override;
 
   // shell::InterfaceFactory<mus::mojom::AcceleratorRegistrar>:
   void Create(shell::Connection* connection,
               mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request)
       override;
 
   // mus::mojom::WindowManagerFactory:
   void CreateWindowManager(mus::mojom::DisplayPtr display,
                            mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
                                client_request) override;
 
   shell::Connector* connector_;
 
   mojo::TracingImpl tracing_;
 
   std::unique_ptr<display::Screen> screen_;
   std::unique_ptr<views::AuraInit> aura_init_;
 
   std::unique_ptr<WmGlobalsMus> globals_;
   std::unique_ptr<WmLookupMus> lookup_;
 
   // The |shelf_layout_| object is created once OnEmbed() is called. Until that
   // time |shelf_layout_requests_| stores pending interface requests.
   std::unique_ptr<ShelfLayoutImpl> shelf_layout_;
-  mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_;
-  std::vector<std::unique_ptr<mojo::InterfaceRequest<mojom::ShelfLayout>>>
+  mojo::BindingSet<ash::mojom::ShelfLayout> shelf_layout_bindings_;
+  std::vector<std::unique_ptr<mojo::InterfaceRequest<ash::mojom::ShelfLayout>>>
       shelf_layout_requests_;
 
   // |user_window_controller_| is created once OnEmbed() is called. Until that
   // time |user_window_controller_requests_| stores pending interface requests.
   std::unique_ptr<UserWindowControllerImpl> user_window_controller_;
-  mojo::BindingSet<mojom::UserWindowController>
+  mojo::BindingSet<ash::mojom::UserWindowController>
       user_window_controller_bindings_;
   std::vector<
-      std::unique_ptr<mojo::InterfaceRequest<mojom::UserWindowController>>>
+      std::unique_ptr<mojo::InterfaceRequest<ash::mojom::UserWindowController>>>
       user_window_controller_requests_;
 
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
   std::set<RootWindowController*> root_controllers_;
 
   mojo::Binding<mus::mojom::WindowManagerFactory>
       window_manager_factory_binding_;
 
   mash::session::mojom::SessionPtr session_;
 
   base::ObserverList<RootWindowsObserver> root_windows_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_WINDOW_MANAGER_APPLICATION_H_