[exp] ash: Ash in Mus.

ash/mus/wm/window_manager_application.h

Index: ash/mus/wm/window_manager_application.h
diff --git a/mash/wm/window_manager_application.h b/ash/mus/wm/window_manager_application.h
similarity index 58%
copy from mash/wm/window_manager_application.h
copy to ash/mus/wm/window_manager_application.h
index 4d3646be3f2dc9b662512eb22407f98a5abc216b..9aa045acee1c3e3216e416fbe0dc1d6837258c62 100644
--- a/mash/wm/window_manager_application.h
+++ b/ash/mus/wm/window_manager_application.h
@@ -1,9 +1,9 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// 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_WINDOW_MANAGER_APPLICATION_H_
-#define MASH_WM_WINDOW_MANAGER_APPLICATION_H_
+#ifndef ASH_MUS_WM_WINDOW_MANAGER_APPLICATION_H_
+#define ASH_MUS_WM_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
@@ -17,33 +17,20 @@
 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
-#include "mash/wm/public/interfaces/user_window_controller.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/interface_factory_impl.h"
 
-namespace ui {
-namespace mojo {
-class UIInit;
-}
-}
-
-namespace views {
-class AuraInit;
+namespace aura {
+class Window;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace muswm {
 
 class AcceleratorRegistrarImpl;
-class BackgroundLayout;
-class ScreenlockLayout;
-class ShadowController;
-class ShelfLayout;
-class UserWindowControllerImpl;
-class WindowLayout;
+class AshInit;
 class WindowManagerImpl;
 
 class WindowManagerApplication
@@ -51,7 +38,6 @@ class WindowManagerApplication
       public mus::WindowObserver,
       public mus::mojom::WindowTreeHostClient,
       public mus::WindowTreeDelegate,
-      public mojo::InterfaceFactory<mash::wm::mojom::UserWindowController>,
       public mojo::InterfaceFactory<mus::mojom::WindowManagerDeprecated>,
       public mojo::InterfaceFactory<mus::mojom::AcceleratorRegistrar> {
  public:
@@ -59,14 +45,11 @@ class WindowManagerApplication
   ~WindowManagerApplication() override;
 
   mus::Window* root() { return root_; }
+  aura::Window* aura_root();
 
   int window_count() { return window_count_; }
   void IncrementWindowCount() { ++window_count_; }
 
-  mus::Window* GetWindowForContainer(mojom::Container container);
-  mus::Window* GetWindowById(mus::Id id);
-  bool WindowIsContainer(const mus::Window* window) const;
-
   mojo::ApplicationImpl* app() { return app_; }
 
   mus::mojom::WindowTreeHost* window_tree_host() {
@@ -89,20 +72,15 @@ class WindowManagerApplication
   void OnEmbed(mus::Window* root) override;
   void OnConnectionLost(mus::WindowTreeConnection* connection) override;
 
-  // InterfaceFactory<mash::wm::mojom::UserWindowController>:
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>
-                  request) override;
-
   // InterfaceFactory<mus::mojom::AcceleratorRegistrar>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request)
       override;
 
   // InterfaceFactory<mus::mojom::WindowManagerDeprecated>:
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mus::mojom::WindowManagerDeprecated>
-                  request) override;
+  void Create(
+      mojo::ApplicationConnection* connection,
+      mojo::InterfaceRequest<mus::mojom::WindowManagerDeprecated> request) override;
 
   // mus::WindowObserver:
   void OnWindowDestroyed(mus::Window* window) override;
@@ -121,40 +99,21 @@ class WindowManagerApplication
   mus::mojom::WindowTreeHostPtr window_tree_host_;
   mojo::Binding<mus::mojom::WindowTreeHostClient> host_client_binding_;
 
-  scoped_ptr<ui::mojo::UIInit> ui_init_;
-  scoped_ptr<views::AuraInit> aura_init_;
+  scoped_ptr<AshInit> ash_init_;
 
   // |window_manager_| is created once OnEmbed() is called. Until that time
   // |requests_| stores any pending WindowManager interface requests.
   scoped_ptr<WindowManagerImpl> window_manager_;
-  mojo::WeakBindingSet<mus::mojom::WindowManagerDeprecated>
-      window_manager_binding_;
-  std::vector<
-      scoped_ptr<mojo::InterfaceRequest<mus::mojom::WindowManagerDeprecated>>>
+  mojo::WeakBindingSet<mus::mojom::WindowManagerDeprecated> window_manager_binding_;
+  std::vector<scoped_ptr<mojo::InterfaceRequest<mus::mojom::WindowManagerDeprecated>>>
       requests_;
 
-  // |user_window_controller_| is created once OnEmbed() is called. Until that
-  // time |user_window_controller_requests_| stores pending interface requests.
-  scoped_ptr<UserWindowControllerImpl> user_window_controller_;
-  mojo::WeakBindingSet<mash::wm::mojom::UserWindowController>
-      user_window_controller_binding_;
-  std::vector<
-      scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>>
-      user_window_controller_requests_;
-
-  scoped_ptr<BackgroundLayout> background_layout_;
-  scoped_ptr<ScreenlockLayout> screenlock_layout_;
-  scoped_ptr<ShelfLayout> shelf_layout_;
-  scoped_ptr<WindowLayout> window_layout_;
-
-  scoped_ptr<ShadowController> shadow_controller_;
-
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace muswm
+}  // namespace ash
 
-#endif  // MASH_WM_WINDOW_MANAGER_APPLICATION_H_
+#endif  // ASH_MUS_WM_WINDOW_MANAGER_APPLICATION_H_