Moves mash/wm into ash/mus

ash/mus/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_
+#ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
+#define ASH_MUS_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"
@@ skipping 13 matching lines @@
 }
 
 namespace views {
 class AuraInit;
 }
 
 namespace ui {
 class Event;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class AcceleratorRegistrarImpl;
 class RootWindowController;
 class RootWindowsObserver;
 class ShelfLayoutImpl;
 class UserWindowControllerImpl;
 class WmGlobalsMus;
 class WmLookupMus;
 class WmScreen;
 
 class WindowManagerApplication
     : public shell::ShellClient,
-      public mus::mojom::WindowManagerFactory,
-      public shell::InterfaceFactory<ash::mojom::ShelfLayout>,
-      public shell::InterfaceFactory<ash::mojom::UserWindowController>,
-      public shell::InterfaceFactory<mus::mojom::AcceleratorRegistrar> {
+      public ::mus::mojom::WindowManagerFactory,
+      public shell::InterfaceFactory<mojom::ShelfLayout>,
+      public shell::InterfaceFactory<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
   // RootWindowController that has a valid root window.
@@ skipping 10 matching lines @@
   // Called when the root mus::Window of RootWindowController is destroyed.
   // |root_controller| is destroyed after this call.
   void OnRootWindowDestroyed(RootWindowController* root_controller);
 
   // TODO(sky): figure out right place for this code.
   void OnAccelerator(uint32_t id, const ui::Event& event);
 
   void AddRootWindowsObserver(RootWindowsObserver* observer);
   void RemoveRootWindowsObserver(RootWindowsObserver* observer);
 
-  session::mojom::Session* session() {
-    return session_.get();
-  }
+  mash::session::mojom::Session* session() { return session_.get(); }
 
  private:
   friend class WmTestBase;
   friend class WmTestHelper;
 
   void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
 
   // 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<ash::mojom::ShelfLayout>:
+  // shell::InterfaceFactory<mojom::ShelfLayout>:
   void Create(shell::Connection* connection,
-              mojo::InterfaceRequest<ash::mojom::ShelfLayout> request) override;
+              mojo::InterfaceRequest<mojom::ShelfLayout> request) override;
 
-  // shell::InterfaceFactory<ash::mojom::UserWindowController>:
-  void Create(shell::Connection* connection,
-              mojo::InterfaceRequest<ash::mojom::UserWindowController> request)
-      override;
+  // shell::InterfaceFactory<mojom::UserWindowController>:
+  void Create(
+      shell::Connection* connection,
+      mojo::InterfaceRequest<mojom::UserWindowController> request) override;
 
   // shell::InterfaceFactory<mus::mojom::AcceleratorRegistrar>:
   void Create(shell::Connection* connection,
-              mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request)
-      override;
+              mojo::InterfaceRequest<::mus::mojom::AcceleratorRegistrar>
+                  request) override;
 
   // mus::mojom::WindowManagerFactory:
-  void CreateWindowManager(mus::mojom::DisplayPtr display,
-                           mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
-                               client_request) override;
+  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<ash::mojom::ShelfLayout> shelf_layout_bindings_;
-  std::vector<std::unique_ptr<mojo::InterfaceRequest<ash::mojom::ShelfLayout>>>
+  mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_;
+  std::vector<std::unique_ptr<mojo::InterfaceRequest<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<ash::mojom::UserWindowController>
+  mojo::BindingSet<mojom::UserWindowController>
       user_window_controller_bindings_;
   std::vector<
-      std::unique_ptr<mojo::InterfaceRequest<ash::mojom::UserWindowController>>>
+      std::unique_ptr<mojo::InterfaceRequest<mojom::UserWindowController>>>
       user_window_controller_requests_;
 
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
   std::set<RootWindowController*> root_controllers_;
 
-  mojo::Binding<mus::mojom::WindowManagerFactory>
+  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
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_WINDOW_MANAGER_APPLICATION_H_
+#endif  // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_